Merge branch 'development'
Merge branch 'development'
Don't return an object that isn't in the public API
Merge pull request #1 from steve-downing/master

Merge master into development