Merge branch 'master' into 382712-ripple-java-7