Merge "apostrophe should be curly" into pi-dev