bug fix in master v1.1
Merge branch 'master' into r2_contacts
done for r2_contacts;this already has master 1.1