Fixed an issue with the release.
Merge branch 'dev' into gh-pages