reverting unintentional part of last commit
Merge branch 'master' into gh-pages