Merge branch 'live-docs' into dev-master