Update to master 5894857

wiki: 7b0aefd