merged changes from locationmap and trunk. resolved by hand.

git-svn-id: https://svn.apache.org/repos/asf/forrest/branches/locationmap_branch@209668 13f79535-47bb-0310-9956-ffa450edef68
1 file changed