forward port r1484307 svn merge -c1484307 https://svn.eu.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X .