Update to master 925a29a

wiki: 86b5613