Yet more edits to thing
Another change to thing
More things
Merge commit '558edec595a37f12a9eb442d922dbc98a5adbc15' into 1.0