Update to master 6b1036c

wiki: 8f6e7b9