5
Squashed 'core/' changes from 0b8b724..4eba548

4eba548 Merge pull request #8 from dylanreid/feature4

git-subtree-dir: core
git-subtree-split: 4eba5489d69c9c0ba7f5f044cd168428fb23989f
Merge commit 'c476335ff6f117412e0bd3b1cad294ef9f2f8a46'