Merge commit '4.4.1_r1' into HEAD

(cherry picked from commit c8eda464e5c81975937d697fc04092b53d5ed7cc)

Conflicts:
	core/Makefile