Add query support for: BEGINSWITH, ENDSWITH, CONTAINS and simple LIKE
Merge remote-tracking branch 'upstream/master'