Quieter doc building on OS X.
Merge branch 'master' into 2.5.0-release (fix earlier mistake).