akvo/akvo-rsr — pull request #705 by KasperBrandt (2014-08-05 13:03:39+00:00)
Title: [#688] Merge master into develop

@zzgvh Couldn't be automatically merged, so created a new branch to test. Can you check/merge?