terpstra Merge pull request #1603 from freechipsproject/fix-regressions …