Ensure that the same encoding is returned in all cases.
Merge branch 'ensure_encoding' into 'master'

Try to ensure that encoding is utf-8

This should resolve the issue of concatenating strings with different encodings which produce the "Encoding::CompatibilityError (incompatible character encodings: UTF-8 and ASCII-8BIT)" error by ensuring that we always attempt to return string with same encoding.