okapi r851
Merge branch 'stable'