Merge branch 'master' into ucsf-2.2.3
UCSF: fix publications issue
Merge pull request #146 from Trott/ucsf-2.2.3

Ucsf 2.2.3