Merge pull request #889 from rustyswayne/1.4.1

Merges in community contributions from @arknu, @dampee and @calaa