Squashed 'core/' changes from 07fe46a..b0d1e2f

b0d1e2f Merge pull request #14 from dylanreid/feature10
d58adf9 -n 10
6fd4fa3 Merge pull request #13 from dylanreid/feature9
3b3dbbd -n 9

git-subtree-dir: core
git-subtree-split: b0d1e2f1eb8431f22431cb72e1aa82de26f3f0f1
10