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 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 1807 (Cleanup TableI.close() #11697)
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 1838 (Connection)
merge develop -D org -I include -E exclude: PR 1840 (Webstart popup windows 11656 develop)
merge develop -D org -I include -E exclude: PR 1842 (upgrade database version to beta2)
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 1849 (Extract Django when it's missing or is the wrong version)
merge develop -D org -I include -E exclude: PR 1853 (11709 tile access (rebased onto develop))
merge develop -D org -I include -E exclude: PR 1861 (fix #11693: prevent rename of user's current group)
merge develop -D org -I include -E exclude: PR 1863 (Use python's json rather than Django's)
merge develop -D org -I include -E exclude: PR 1865 (assist #11675: prevent some leaking direct buffers)
merge develop -D org -I include -E exclude: PR 1866 (Make log filename setting secure (see #11154).)
merge develop -D org -I include -E exclude: PR 1867 (ImportLibrary: read from each used file's mapped ID)
merge develop -D org -I include -E exclude: PR 1868 (Update develop submodules)
merge develop -D org -I include -E exclude: PR 1871 (Black thumbnails)