Merging master into gh-pages for initial rollout.