Merge with trunk

git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/branches/MPIR-279@1639523 13f79535-47bb-0310-9956-ffa450edef68