Squashed 'core/' changes from 99ab516..0b1b293

0b1b293 Merge pull request #6 from dylanreid/feature3
2b583fe -n 3

git-subtree-dir: core
git-subtree-split: 0b1b29368ea13b666b222cd60c8a2668411c0590
3