Merge branch 'gh-pages'
Weekly Commit

Weekly Project Commit
Merge branch 'master' into gh-pages