Merge 0.1.5 maint

Port 0.1.5-maint changes to master HEAD.