Merge pull request #2512 from rbeitra/master

Fix for issue #2496 (ofColor == and != operators ignoring alpha)