Squashed 'core/' changes from 382ba06..3771892

3771892 -n 3
e7793f8 Merge pull request #1 from dylanreid/feature2
5af4f03 -n 2

git-subtree-dir: core
git-subtree-split: 377189234d103077466667244c512d5117949931
3