bug fix on building of docs.
Merge branch 'dev' into feature/clext