Update to master 3af7e47

wiki: 0ed12d4