Fix dependencies so that make does not keep going after an error
Merge remote-tracking branch 'upstream/master' into feature/LikeExpression