Andrew Morgan 6982db9651 Merge branch 'master' into develop %!s(int64=3) %!d(string=hai) anos
..
__init__.py 4b965c862d Remove redundant "coding: utf-8" lines (#9786) %!s(int64=3) %!d(string=hai) anos
test_remote_handler.py 4b965c862d Remove redundant "coding: utf-8" lines (#9786) %!s(int64=3) %!d(string=hai) anos
test_terse_json.py 6982db9651 Merge branch 'master' into develop %!s(int64=3) %!d(string=hai) anos