0.8, 0.10
Merge branch 'master' into mocks