Merge branch 'rubocop-0.27'