Merge "Don't be clever with strings" into pi-dev