Squashed 'core/' changes from f744889..90952eb

90952eb Merge pull request #2 from dylanreid/develop
c470f64 -n 5
4fdf7be -n 4

git-subtree-dir: core
git-subtree-split: 90952eb26e54713b487a42f91a6d54fa3eb05ec9
5