Bumped to temporary version number
Merge branch 'master' into ubuntu
Bumped version number for the ubuntu branch