forward port r1571643 with `svn merge -c1571643 ^/tiles/framework/branches/TILES_3_0_X .` ref: http://thread.gmane.org/gmane.comp.apache.tiles.scm/576