Merge branch 'develop'
Don't assert.
Merge branch 'master' into develop