Fix  #1174.
Merge pull request #1175 from akbargumbira/develop

Fix  #1174.
Merge branch 'develop' of https://github.com/AIFDR/inasafe into flood_categorising