[#654] Merge branch 'release/candidate' of github.com:akvo/akvo-rsr
RSR v2.3.9.1 Yam Hotfix - Merge branch 'release/candidate' of github.com:akvo/akvo-rsr
Merge branch 'release/candidate' of github.com:akvo/akvo-rsr
for 2.3.9.2 Yam Hotfix 2 for import scripts
#685 release notes for hotfix
#685 fixed minor formatting
Merge pull request #696 from akvo/master

Merge Master into Release/Candidate #688