revert to 65f0bd6
Merge branch 'master' into unstable