Update to 6.4
Merge branch 'master' of github.com:axilleas/gsoc