Minor readme update
Merge remote-tracking branch 'origin/master' into release
Merge branch 'release'