Merge remote-tracking branch 'origin/master' into simplify-groups-load

Import fix for a warning caused by a "quietly" failing test.

package.json

@@ -22,7 +22,6 @@
     "babel-plugin-istanbul": "^5.1.0",
     "babel-plugin-mockable-imports": "^1.1.0",
     "babel-plugin-transform-async-to-promises": "^0.8.6",
-    "babel-preset-env": "^1.7.0",
     "babelify": "^10.0.0",
     "browserify": "^16.2.3",
     "browserify-shim": "^3.8.12",

src/sidebar/components/test/hypothesis-app-test.js

@@ -383,7 +383,7 @@ describe('sidebar.components.hypothesis-app', function() {
     it('clears groups', () => {
       const ctrl = createController();
 
-      ctrl.login().then(() => {
+      return ctrl.login().then(() => {
         assert.called(fakeStore.clearGroups);
       });
     });