Merge remote-tracking branch 'origin/develop' into cpp-clang-fixes

Conflicts:
	components/xsd-fu/templates-cpp/OMEXMLMetadata.template
Merge pull request #945 from rleigh-dundee/cpp-metadatamap

cpp: bioformats: Add MetadataMap class for original metadata
Merge pull request #949 from rleigh-dundee/cpp-clang-fixes

C++ fixes to work around clang++/libc++ bugs
Update develop submodules

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

Generated by BIOFORMATS-5.1-latest-docs-autogen#28 (http://ci.openmicroscopy.org/job/BIOFORMATS-5.1-latest-docs-autogen/28/)