(merge from head) fixed license reference text; slight changes to comments to avoid spurious inspect tool warnings