Merge branch 'master' into gh-pages

Conflicts:
.idea/workspace.xml