Merge branch 'master' into script_dev & AST type

Conflicts:
	Makefile.in
Merging master