Update to master 05bbe27

wiki: 8f6e7b9