Doesn't change the actual logic, but should avoid confusions ;-) See issue #4557 for more details. svn path=/trunk/; revision=41152