Merge pull request #49 from kainx/4.1-dev

Proposed fix for Bugzilla bug #60