Restore doc building (html)
Merge origin/develop