added branch whitelist
Merge branch 'master' into parallelLabelAnnot