[#1053] Merge branch 'issue/1053' of https://github.com/akvo/akvo-flow into issue/1053
[#1053] Merge branch 'issue/1053' of https://github.com/akvo/akvo-flow into issue/1053

akvo/akvo-flow,akvo/akvo-flow,akvo/akvo-flow,akvo/akvo-flow,akvo/akvo-flow