Bringing master up-to-date from gh-pages commits

Didn't notice was committing to the branch.