Merge remote-tracking branch 'origin/development' into development
* Modified version number for development (to test release branching in gitflow)