Update to master 8c3c0c6

wiki: 5f43431