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 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 646 (Save current revision number in memo file)
merge develop -D org -I include -E exclude: PR 684 (AVI: fix byte count when skipping rows)
merge develop -D org -I include -E exclude: PR 686 (CellWorx: do not assume that the first well/field file exists (rebased onto develop))
merge develop -D org -I include -E exclude: PR 687 (Deliberately change generated code comments)
merge develop -D org -I include -E exclude: PR 689 (Initial C++ implementation)