Update to master 31511bc

wiki: 23683b9