Merge branch 'master' into cooking

diff --cc parser.c
index 66c372602da732e09d55d30f28362643f1957217,c50eb176a9f296160f705e9c3b068a0c39c6ddcc..836f6ca663b82b4e6395b8bbddcc762e43ed992d
mode 100644,100755..100755
--- 1/parser.c
--- 2/parser.c
+++ b/parser.c