Squashed 'core/' changes from dcdc2f0..c2e14e5

c2e14e5 Merge pull request #17 from dylanreid/16
57b8bc2 -n 16

git-subtree-dir: core
git-subtree-split: c2e14e5bdefe65c5441954873f9aa02a8abf1027
Merge commit '9366a57aceaa89e1ed47b25c02894fdfa1a17c29'