Merge branch 'master' into feature/fly-in-header

Conflicts:
comparison.html