Merge branch 'gh-pages' into feature/41-usertest