Re-merge of development (hotfix)

Last merge didn't include some files... Here they are.