merge develop -D org -I include -E exclude: PR 528 (Tile performance improvements for VMS and NDPI)
merge develop -D org -I include -E exclude: PR 635 (Use jgit-buildnumber to set version information in Maven)
merge develop -D org -I include -E exclude: PR 640 (cpp: Add initial C++ implementation)
merge develop -D org -I include -E exclude: PR 643 (Data test updates)
merge develop -D org -I include -E exclude: PR 644 (Add support for writing ModuloAlong* annotations)
merge develop -D org -I include -E exclude: PR 645 (Leica LIF: also parse channel names from FilterSettingRecords (rebased onto develop))
merge develop -D org -I include -E exclude: PR 646 (Save current revision number in memo file)
merge develop -D org -I include -E exclude: PR 647 (Make JDK 1.6 the minimum supported version)
merge develop -D org -I include -E exclude: PR 660 (test-build: Build sphinx docs)
merge develop -D org -I include -E exclude: PR 662 (Fix SAX handler implementations to prevent value truncation)
merge develop -D org -I include -E exclude: PR 665 (Synchronize docs with LOCI Bio-Formats content (rebased onto develop))
merge develop -D org -I include -E exclude: PR 669 (jai: Convert to valid UTF-8)
merge develop -D org -I include -E exclude: PR 671 (Matlab developer documentation page update (rebased onto develop))