change in rule about not deleting branches
Merge branch 'master' into #529