build docs changes for commit 1a37a63. No min-files hurt.
Merge branch 'live-docs' into dev-master

Had to do another merge here because I didn't build the docs changes for
my prior commit (1a37a63).
Merge branch 'dev-master' into dev-3.x

Had to do another merge here because I didn't build the docs changes for
my prior commit (1a37a63).