Merge branch 'fix-encodings' into develop
Merge branch 'fix-sensu-optional-settings' into develop
Merge branch 'match-ruby-version' into develop