backport r1427572
 `svn merge -c1427572 ^/tiles/framework/trunk`
 http://svn.apache.org/viewvc?view=revision&revision=1427572


git-svn-id: https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_3_0_X@1427575 13f79535-47bb-0310-9956-ffa450edef68