Merge branch 'future' into 0.6.4