Merging changes from Indev for 1.6.0 release

Merge changes for v1.6.0 release of MCC :)
Thanks for all your contributions, bearbear and dogwatch!