okapi r843
Merge branch 'stable'