Syncing develop with 1.6.0 release

Updating master with develop branch (1.6.0)