Update to master 43de5ee

wiki: e505a7c