Fix redmine #2936

Please give it a day or two so that it's commented on redmine.