Merge external changes

git being a PITA original commit
https://github.com/muzhig/sonypy/commit/24d3a057a83180a130f7864e3e34368e64039ad3