Merge pull request #475 from akvo/develop

Akvo.org v1.1.10 - Kinetic Kiwi
Merge pull request #476 from akvo/release/candidate

Akvo.org v1.1.10 - Kinetic Kiwi
Merge pull request #478 from akvo/master

Master to Develop: Akvo.org v1.1.10 - Kinetic Kiwi