Squashed 'core/' changes from a937670..61a7df5

61a7df5 Merge pull request #11 from dylanreid/feature7
711f9eb -n 7

git-subtree-dir: core
git-subtree-split: 61a7df5650d51b8200a1eb950c412314e09caa35
Merge commit '6459e4aa284634327166e208996f059652a218f4'