Merge 0.1.5 maint to master HEAD

Port 0.1.5-maint changes to master HEAD.