Update to master 6bbc1aa

wiki: 23683b9