Merging changes from trunk since start of branch.

Used this command:

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

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