[1.0] Another commit to fix #1476 and fixes possible unexpected behavior introduced in r5006.
[1.0] Another commit to fix #1476 and fixes possible unexpected behavior introduced in r5006.

git-svn-id: 0559b250b01420a521fd06901a06f8112202e86e@5009 625475ce-881a-0410-a577-b389adb331d8

ascorbic/doctrine-tracker