RC1 of Project Curacao Part 3: final edits requested of author
Merge branch 'master' of https://github.com/themagpimag/magpi-issue20