Update to master 00dd687

wiki: ea01085