Merge proposals dependent on lp:~ccomb/zcadoc/book-fr

lp:~ccomb/zcadoc/book-fr has no merge proposals.