...
Conversion: Fix error when converting EPUB/HTML files that contain invalid margin or padding declarations. Fixes #1360842 [ePub to PDF convertion failed](https://bugs.launchpad.net/calibre/+bug/1360842)
...
Workaround for bug in hdiutil
Make the shortcut config widget a little more robust by not relying on QKeyEvent::text()
Add providing a device driver with information about the current library when connecting and when the library changes while connected.

For memory, we discussed this some weeks ago. I just got around to doing it.
Merge branch 'master' of https://github.com/cbhaley/calibre
Add an explicit hide() for the edit metadata dialog, though I dont see why it should be necessary. Maybe it will fix the phantom edit metadata dialog problem.
...
Workaround for Qt 5 regression causing custom colors in color chooser dialogs to not be remembered between calibre sessions
Driver for HTC C. Fixes #1360678 ['Send To Device' icon not appearing](https://bugs.launchpad.net/calibre/+bug/1360678)
Output busnum and devnum when failing to open mtp device
More general fix for the OS X keyboard shortcuts not working problem.  Fixes #1360849 [m command to merge books no longer functions](https://bugs.launchpad.net/calibre/+bug/1360849)

Add all actions created using the create_action/create_menu_action API
directly to the main window this allows their shortcuts to work on OS X.
Merge remote-tracking branch 'upstream/master'