Update to master 3c97c1c

wiki: 98b6e7e