Prevent failing if qgis.core is not available
Merge upstream and merge in custom_logging.py to handle the two exception types
Merge pull request #679 from vdeparday/master

Prevent failing if qgis.core is not available