Updated version numbers
Merge branch 'develop' into release/0.13