Merge pull request #3948 from techee/warning_fix2