CCEffects - Fix two compiler warnings
Merge remote-tracking branch 'upstream/develop' into develop
Merge pull request #1057 from thayerandrews/develop

CCEffects - Fix compiler warnings