Removed stray file from 3.6.x
Merge branch 'maint'
Merge branch 'master' into next