Merge branch 'master' into blub/bc3

diff --cc ast.c
Simple merge

diff --cc ast.h
Simple merge

diff --cc ir.c
Simple merge

diff --cc ir.h
Simple merge