Merge branch 'master' of https://github.com/stedolan/jq into contains-operator

Conflicts:
	lexer.gen.c
	parser.gen.c
	parser.gen.h
	parser.gen.info
	parser.y