Update to master 326d657

wiki: e505a7c