Merge pull request #2983 from iBotPeaches/develop

fixes warnings