Merge changes from master branch:
	- e29cec756f0d5c0a9f05d8f657f06f6da5b10896
	- 0a8e1d4a1bcc430bc709e0fc4191493ddebd003b