1.5 development

Syncronise with fixes from 1.5 branch