Squashed 'core/' changes from 744ebed..90952eb

90952eb Merge pull request #2 from dylanreid/develop
c470f64 -n 5
4fdf7be -n 4
f744889 Merge pull request #1 from dylanreid/feature3
360f2c1 -n 3

git-subtree-dir: core
git-subtree-split: 90952eb26e54713b487a42f91a6d54fa3eb05ec9
Merge commit '6b3106f525955c74e20b43a7aad4b45cdd1820e0'