Merge branch '2015-core-set'