Squashed 'core/' content from commit 744ebed

git-subtree-dir: core
git-subtree-split: 744ebed57dcbf5adef5bfe1e5a3e3e8488791efc
Merge commit 'ae383bf5224de733c9a83aba43ccdc1281f12851' as 'core'
Squashed 'core/' changes from 744ebed..f744889

f744889 Merge pull request #1 from dylanreid/feature3
360f2c1 -n 3

git-subtree-dir: core
git-subtree-split: f744889ad4c22dddbee3e41084eecf5e05885e63
Merge commit '78b2f868c1baa99e354a3d9fd086cc163e0a9e14'
3