Differential Revision: https://code.wildfiregames.com/D338 Patch By: Vladislav Refs: https://code.wildfiregames.com/D317 This was SVN commit r19421.
Also fix some of the warnings that jenkins showed. Differential Revision: https://code.wildfiregames.com/D24 This was SVN commit r19115.