integrated feedback from Thomas
Merge remote-tracking branch 'origin/jf/conda' into jf/conda