Merge pull request #2150 from ledvinap/fix-warnings