Merge branch 'refs/heads/master' into development
Double post, updated Version number
Merge branch 'refs/heads/development'