Refine the GSoC report according to Swarup's advice
Merge branch 'master' into dev