Uping the version number.
Removing a unless comment.
Merge branch 'release/0.6.4' into develop