merge develop -D org -I include -E exclude: PR 450 (omero: Python 2.6 is the minimum supported version)
merge develop -D org -I include -E exclude: PR 479 (Update Windows service docs (see #11448) (rebased onto develop))
merge develop -D org -I include -E exclude: PR 481 (Travis merge documentation (rebased onto develop))