Announced changes after merging #195 and #216.
Merge branch 'master' of https://github.com/swig/swig

Conflicts:
	CHANGES.current