merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 262 (Training develop)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 265 (Review the Homebrew installation page (rebased onto develop))