Merge branch 'master', remote-tracking branch 'origin' into gh-pages
Merge branch 'master', remote-tracking branch 'origin' into gh-pages
Merge remote-tracking branch 'origin' into gh-pages

Merging to gh-pages.
Fixing indents