merging master to development

Isn't this going in the wrong direction?  heh!