AIFDR/inasafe — pull request #870 by timlinux (2014-03-07 08:55:16+00:00)
Title: Synchonise develop with my working develop branch

This PR is to ensure that all changes in my develop branch are synced to the upstream repo.