Update to master e44e4ed

wiki: 4829ab8