Update to master b00bf27

wiki: e505a7c