Squashed 'core/' changes from 90952eb..1b0a891

1b0a891 Merge pull request #3 from dylanreid/feature0
1880dc1 -n 0
9dd00a7 -n 1

git-subtree-dir: core
git-subtree-split: 1b0a891eab5d6b09098304163a1af2ad9aacf5c7
Merge commit 'fb139af617216a1b1f684fd25ed95a00e88983a8' into feature0
1