Merge branch 'master' of github.com:neilhwatson/core
Merge branch 'master' of github.com:neilhwatson/core