Merge 1.5.0.5 in from 'maint'