merge develop -D org -I include -E exclude: PR 1385 (Update the OMERO VirtualBox image)
merge develop -D org -I include -E exclude: PR 1712 (Create release source artifact containing all submodules)
merge develop -D org -I include -E exclude: PR 1733 (Preventing system users being removed from system groups)
merge develop -D org -I include -E exclude: PR 1753 (Edit user)
merge develop -D org -I include -E exclude: PR 1756 (Exclude the import log from the list of files.)
merge develop -D org -I include -E exclude: PR 1779 (Copy rendering 11552)
merge develop -D org -I include -E exclude: PR 1800 (Simple salting of MD5 passwords (See #1387))
merge develop -D org -I include -E exclude: PR 1811 (11607 scripts)
merge develop -D org -I include -E exclude: PR 1818 (Error handling of tile image loading in PanoJS See #11709)
merge develop -D org -I include -E exclude: PR 1820 (Worked around method_decorator problem with custom getattr)
merge develop -D org -I include -E exclude: PR 1822 (Script parameter)
merge develop -D org -I include -E exclude: PR 1824 (Initialize table before file chooser.)
merge develop -D org -I include -E exclude: PR 1832 (fix #11465: properly populate roles proxy object)
merge develop -D org -I include -E exclude: PR 1837 (Qa submit)
merge develop -D org -I include -E exclude: PR 1841 (assist #11250: manage transfer buffer size)
merge develop -D org -I include -E exclude: PR 1844 (Paste rnd)
merge develop -D org -I include -E exclude: PR 1845 (Disable chgrp event logs (rebased onto develop))
merge develop -D org -I include -E exclude: PR 1846 (Order rendering settings loading.)
merge develop -D org -I include -E exclude: PR 1847 (Allow fast finish up travis builds)
merge develop -D org -I include -E exclude: PR 1849 (Extract Django when it's missing or is the wrong version)