testing
Merge branch 'master' into jdh
shows joe in picker