Version bump.
Merge branch 'development'
Fix for rpm packaging error.
Merge branch 'development'
Merge branch 'development' into development-ubuntu-utopic