Merge branch 'live-docs' into dev-master
Merge branch 'dev-master' into dev-3.x