Commit 2f2129b1cea07a482aaef43b4b23f63be4c29418

Edward Thomson 2016-02-11T15:47:01

Merge pull request #3612 from arthurschreiber/arthur/fix-3173 Horrible fix for #3173.