Squashed 'core/' content from commit 382ba06

git-subtree-dir: core
git-subtree-split: 382ba06b4af2c9d538d1b7bf751d22aef1813e78
Merge commit '9c0b6c1fcb43ef03d3d64bfa5670d8729701cb89' as 'core'
Squashed 'core/' changes from 382ba06..e7793f8

e7793f8 Merge pull request #1 from dylanreid/feature2
5af4f03 -n 2

git-subtree-dir: core
git-subtree-split: e7793f87eef96d6b81046bae117ee4df443f147f
Merge commit 'e72f5f2169a01c3436d9928adbe1c9f551e500a9'