Merge pull request #2805 from iBotPeaches/develop

fix doc warnings/errors