merge libimobiledevice:master changes