Merge "lint support."