Getting swirl tidied up a bit
Merge remote-tracking branch 'origin/3dreordered' into 3dreordered