attempt to fix http://hub.qgis.org/issues/9184
Merge pull request #1026 from anitagraser/working

attempt to fix http://hub.qgis.org/issues/9184