Merge topic 'python-py3k'

8aead085 Add tests for encoded strings in python.
4f450d14 For Py3k, return bytes for non-utf8 C++ strings.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !572