okapi r839
Merge branch 'stable'