Update version numbers
Merge branch 'dev' into feature_travis