[#2019] Update lint version.
Merge master.
Fix lint.