Merging 1.4.2 to develop branch

@evanmcc @russelldb if you could eyeball the diff. All eunit tests passed for me