Merge branch 'master' into developer_can_push_to_protected_branches_option