Merge branch 'master' into drummondreed
Test of Oxygen editor
Merge branch 'drummondreed'
Merge pull request #5 from talltree/master

Test of Drummond's local editing