AIFDR/inasafe — pull request #845 by timlinux (2014-02-27 14:04:07+00:00)
Title: Apply hotfixes and improvments from develop to fix failing jenkins tests.

This PR integrates all the upstream improvements we have made in develop for 2.0.2 release.