Fixing out-of-sync gh-pages branch

Seems like there are no actual changes, but somehow several commits got desynced and it's causing conflicts on another merge.