1.0.6 Merge

Merging 1.0.5 back into trunk for 1.0.6 release