Merged latest changes from trunk.

git-svn-id: https://svn.apache.org/repos/asf/esme/branches/lift-2.4@1171002 13f79535-47bb-0310-9956-ffa450edef68