Trial fix for BZ967609
(cherry picked from commit 3976289e0b0f32badfc98b7cdfe66ab43e1b0e34)
Merge pull request #246 from manstis/BZ967609

Trial fix for BZ967609