Merge image resource changes and others for 1.6.1 release

Update for better retina support and bug fixes to bring master current with release version