Merge branch 'master' into gh-pages
Strategic Plan
Merge branch 'gh-pages'