Merging in from the head a number of lint, style, compiler changes