Merge branch '2015-core-set'
Merge branch 'master' into gh-pages