Merge pull request #876 from thayerandrews/develop

CCEffectRefraction - Fix various issues uncovered by Viktor during testing
Merge remote-tracking branch 'upstream/develop' into develop