Squashed 'core/' changes from cca602d..e572da5

e572da5 Merge pull request #2 from dylanreid/8
eac2a7c -n 8

git-subtree-dir: core
git-subtree-split: e572da5ea31b2e5d525c8fbd67064a611e4ea458
Merge commit '3808622576c970c2387212b3b9473ddac597ccc5'