Squashed 'core/' changes from 61a7df5..6fd4fa3

6fd4fa3 Merge pull request #13 from dylanreid/feature9
3b3dbbd -n 9
07fe46a Merge pull request #12 from dylanreid/feature8
2e16c3b -n 8

git-subtree-dir: core
git-subtree-split: 6fd4fa3fac8d3339c012ac132243db27afbc2dae
9