Merged from trunk using this command:

svn merge -r 1546817:HEAD https://svn.apache.org/repos/asf/roller/trunk .

git-svn-id: https://svn.apache.org/repos/asf/roller/branches/rome2@1588765 13f79535-47bb-0310-9956-ffa450edef68