Change lint settings (workaround)
Merge branch 'master' into stable