From c805da7414855a9e4f540bd4cb0b39f50e875d5c Mon Sep 17 00:00:00 2001
From: Snoopy Crime Cop <snoopycrimecop@gmail.com>
Date: Thu, 28 Dec 2017 12:20:02 +0000
Subject: [PATCH] merge master -Dnone -Ibreaking -Eexclude -Snone

Repository: ome/ome-common-java
Excluded PRs:
  # PR 21 melissalinkert 'Revert PR #15' (user: melissalinkert)
  # PR 16 rleigh-codelibre 'Java 9 build support' (user: rleigh-codelibre)
Already up-to-date.

Generated by OME-FILES-CPP-DEV-breaking-push-superbuild#530 (https://ci.openmicroscopy.org/job/OME-FILES-CPP-DEV-breaking-push-superbuild/530/)