Updated build (that I forgot to do after merge)
Merge branch 'develop' into gh-pages