svn path=/trunk/; revision=29161
See issue #2110,2111 for more details. svn path=/trunk/; revision=26480