Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Bump version to 0.6.4
Merge branch 'develop'
Merge branch 'master' into develop