Updated docs.
Merge branch 'master' into release
Merge remote-tracking branch 'origin/release' into release