Micro updates.
Merge branch 'release/1.0.6'