merge develop -D org -I include -E exclude: PR 524 (xsd-fu: Issue a warning if genshi is not available)