Oops! Was testing. Fixed now
Merge remote-tracking branch 'origin/gingerbread-flicker-fix' into dev-jamie