Prevent failing if qgis.core is not available
Merge upstream and merge in custom_logging.py to handle the two exception types
fix rst doc compile error
changed utilities call to use safe_qgis package name
Merge branch 'master' of github.com:AIFDR/inasafe
Remove reference to impact function merge dialog from inasafe-683 branch
Merge pull request #679 from vdeparday/master

Prevent failing if qgis.core is not available
Analyze impact function style, return clipping flag (to clip or not to clip layers)
Merge branch 'master' of github.com:AIFDR/inasafe into native_qgis_impact