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

07fe46a Merge pull request #12 from dylanreid/feature8
2e16c3b -n 8
61a7df5 Merge pull request #11 from dylanreid/feature7
711f9eb -n 7
a937670 Merge pull request #10 from dylanreid/feature6
a771069 -n 6

git-subtree-dir: core
git-subtree-split: 07fe46afa7ae9217c9d01c2ba503db7df5f8e6b8
8