Made a quick non-ascii sweep through, may still be a few left.

May need to look at a better way of achieving this further along the way.
Merge remote-tracking branch 'origin/master'