merge from kikito/inspect.lua master