Merge branch 'release/2.0.4'
Merge branch 'develop'
[#213] Update RELEASE_NOTES
Merge pull request #215 from akvo/release/2.0.5

Release/2.0.5
Merge branch 'master' into develop