Pull fix for bug #436 from branch_1_1