Merge pull request #1209 from cchristelis/develop

Fix rollback
Merge branch 'develop' of github.com:AIFDR/inasafe into develop