Merge remote-tracking branch 'upstream/master' into johnmcconnell
My head wasn't attached last time.
I changed a single-quote string to double
changed single-quote string
added a space
removed trailing whitespace
I removed trailing whitespace
made line smaller
Merge branch 'master' into johnmcconnell