Try to fix #321 and fix #287
Fix #287
Actually fix #287?
Merge pull request #326 from mozilla/fix-travis-bug

Try to fix #321 and fix #287