Avoid travis problems
Merge branch 'fix-rubocop' into better-error-messages