okapi r839
Merge branch 'stable'
Merge branch 'master' into next