Changes to support Maven 3.2.1 (to allow Travis CI builds)