Update to master 866c201

wiki: 98a656c