[#888] Manually applying changes from feature branch

See:

https://github.com/akvo/akvo-flow/commit/8816626d31ce3aeb5a2db2258dc271562841e1e5