Merge "Use Sphinx 1.5 warning-is-error"