Update to master 88849d5

wiki: e505a7c