Bug fix for the previous commit (r21686).
Authored by: bugman 2013-11-27
Parent: [r21686]
Child: [r21688]