Update to master 2026ff5

wiki: e505a7c