Update to master 3bd7835

wiki: e505a7c