bugfix
Merge pull request #986 from DrMoriarty/upstream

Trivial bugfix
Merge branch 'master' of git://github.com/BradLarson/GPUImage