Update master branch

Merging final changes made on gh-branches into master before deleting gh-pages.