Maint 1.4

Merge maintenance fixes to master.