Merge pull request #376 from glynnc/master

Refactor EffectsBlit