merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 253 (Fix code example for log level checking.)