Bug fix
Update version
Update version
Update version
Merge conflicts
Merge conflicts
Merge conflicts
Merge branch '6.4' of https://github.com/Gasolene/Rum.framework into 6.4