Merged v1.0.6 in

And hopefully resolved conflicts...