Merge branch 'master' into branch3

Conflicts:
index.html