Merge branch 'master' into new_branch_name
Moved whole branch to new development