Fix rubocop error.
Merge branch 'stable'