synchronizing with trunk..

git-svn-id: https://svn.apache.org/repos/asf/incubator/jspwiki/branches/MVN3_BRANCH@1486442 13f79535-47bb-0310-9956-ffa450edef68