Merge github.com:rsoulliere/Evergreen-DocBook