Merge remote-tracking branch 'stagrlee/master' into autotools

Conflicts:
	Makefile
	jq_test.c

parser.y

@@ -92,7 +92,7 @@ struct lexer_param;
 
 %type <blk> Exp Term MkDict MkDictPair ExpD ElseBody QQString FuncDef FuncDefs String
 %{
-#include "lexer.gen.h"
+#include "lexer.h"
 struct lexer_param {
   yyscan_t lexer;
 };