okapi r641
Merge branch 'master' into next