Merges develop into master

rc1