Update version numbers
Merge branch 'master' into nifty