Update rubocop version
Merge branch 'master' into mutant-0-4