Merge branch 'master' of github.com:grantfellows/test into testBranch