Add forgotten file in previous commit
Merge branch 'master' into gh-pages