getting master back to normal
Merge branch 'master' into gh-pages

Conflicts: