Squashed 'core/' changes from 6fd4fa3..a9fcf0f

a9fcf0f Merge pull request #15 from dylanreid/feature11
9589c07 -n 11
b0d1e2f Merge pull request #14 from dylanreid/feature10
d58adf9 -n 10

git-subtree-dir: core
git-subtree-split: a9fcf0fb9cb3a635e7298aea7c8d00a1b3e40dd9
11