Merge of master into development

Just merged the extra three commits from master back down into development, to keep it up to date.