Checking in changes prior to tagging of version 1.6.1.