16
Squashed 'core/' changes from 22f2bf0..a230a6a

a230a6a Merge pull request #18 from dylanreid/17
5fa9495 -n 17
c2e14e5 Merge pull request #17 from dylanreid/16
57b8bc2 -n 16
dcdc2f0 -n 15

git-subtree-dir: core
git-subtree-split: a230a6a264c37d03d588945d129b0a35b8e45545
17