Merge remote-tracking branch 'upstream/master' into memleak

# Conflicts:
#	CHANGES.current