Remove binary image matching code
Merge remote-tracking branch 'origin/develop' into php5.4