[bugfix] Update to bugfix master.