Merge pull request #413 from akvo/develop

Akvo.org v1.1.8 - Invisible ilama
Merge pull request #414 from akvo/release/candidate

Release - Akvo.org v1.1.8 - Invisible ilama
Merge pull request #416 from akvo/master

Master