Fix bungles
Merge remote-tracking branch 'origin/sample-qsort' into develop