Checking in changes prior to tagging of version 0.42_01.

Changelog diff is:

Change-Id: Iabe8ac6b46be7ec8695f44995c7ac4a4fe5a4fdf