Rubocop fixes.
Merge branch 'rubocop'
Version bump