+
Merge branch 'master' into dev

Conflicts:
	src_ext/Makefile