fix two regressions introduced overnight
Merge pull request #490 from ged-lab/emergency/fix_regressions

fix two regressions introduced overnight
Merge remote-tracking branch 'origin' into cleanup/filepy2