Update to master 3af7e47

wiki: 5d47301