Filter inactivate users from 'omero user email' (Fix #12024)
Use temp/rename for config.xml writing (Fix #12002)
Prevent save_on_close from omeroweb/settings.py (See #12002)
Fix flake8 in user.py
Add **kwargs to MockConfigXml
Fix test_config.py failure

Rather than considering all non-default environments
as failures on read-only, only consider it a failure
when read-only was not *explicitly* requested.
Fix flake8 for test_config.py
travis: Split build logic into a separate script
travis: Correct python logic
travis: Move flake8 runs to travis-build
travis: Split python build into two steps
Merge pull request #2273 from joshmoore/rebased/develop/cli-bug-fixes

CLI bug fixes (rebased onto develop)
travis: Order python first
Update develop submodules

Repository: openmicroscopy/openmicroscopy
Already up-to-date.

Repository: openmicroscopy/bioformats
Updating a521a89..a7b8690
Merged PRs (fast-forward):
  # PR 1036 hflynn 'Remove note about Fiji shipping BF 4.4.x (rebased onto develop)'
  # PR 1038 hflynn 'Fix link to bitplane release notes (rebased onto develop)'
  # PR 1035 rleigh-dundee 'C++: Compatibility workrounds for Boost.Filesystem 1.46 and earlier'
  # PR 1032 melissalinkert 'Update version history for 5.0.1 (rebased onto develop)'
  # PR 1006 melissalinkert 'Read internal pyramids from CellSens .vsi data (rebased onto develop)'
  # PR 1008 melissalinkert 'Enable SDT plane preloading by default (rebased onto develop)'
  # PR 1007 melissalinkert 'SVS import and TIFF export fixes (rebased onto develop)'
  # PR 1005 melissalinkert 'ND2: always set the field index to 2 (rebased onto develop)'
  # PR 1004 bpindelski 'Update docs regarding BF and Eclipse (see #12127). (rebased onto develop)'
  # PR 991 melissalinkert 'Only add a MetadataOnly element if no TiffData elements are present'
  # PR 990 melissalinkert 'Memoization fixes (rebased onto develop)'
  # PR 1027 rleigh-dundee 'C++: Add cmake build infrastructure for libtiff and threading'
  # PR 985 qidane 'Updating transform catalog for 2013-10-dev-1'
  # PR 1001 qidane 'New time docs and samples'
  # PR 1010 rleigh-dundee 'C++ fixes and test improvements'
  # PR 1019 joshmoore 'ITK documentation fixes from @iMichka (rebased onto develop)'

Repository: ome/scripts
Already up-to-date.

Repository: openmicroscopy/ome-documentation
Updating fd4b617..6c60e92
Merged PRs (fast-forward):
  # PR 729 sbesson 'Add page for Consortium CI jobs'
  # PR 724 joshmoore 'In-place documentation (rebased onto develop)'
  # PR 728 joshmoore '5.0.1 upgrade additions. (rebased onto develop)'
  # PR 727 aleksandra-tarkowska 'updating omeroweb console output (rebased onto develop)'
  # PR 726 aleksandra-tarkowska 'Setting cache (rebased onto develop)'
  # PR 720 aleksandra-tarkowska 'Session engine update (rebased onto develop)'
  # PR 725 hflynn 'Remove webstart limitation (rebased onto develop)'
  # PR 723 hflynn 'Updating Demo server availability for 5.0.x (rebased onto develop)'
  # PR 718 rleigh-dundee 'Install cleanup (develop)'
  # PR 714 manics 'Update supported Linux versions for 5.0 (rebased onto develop)'

Generated by OMERO-5.1-latest-submods#75 (http://ci.openmicroscopy.org/job/OMERO-5.1-latest-submods/75/)
Merge pull request #2277 from rleigh-dundee/travis-script

travis: Split build logic into a separate script
Merge pull request #2248 from snoopycrimecop/merge/develop/submodules

Update develop submodules (Regularly scheduled bump)