More changes to thing
Merge commit 'e40e1d8395ea0bfe892246bd27ac0670698d9043' into 1.0