Squashed 'core/' changes from 4eba548..d78c786

d78c786 Merge pull request #9 from dylanreid/feature5
983cf17 -n 5

git-subtree-dir: core
git-subtree-split: d78c7868c6d1bfb5a683c1ecdaef6cce631f6f2b
Merge commit '528b8959f58c8b03b5aac05c59842ba67cddbd9b'