Merge branch 'master' into master-backmerge

2 jobs for master-backmerge in 4 minutes and 23 seconds (queued for 4 seconds)
Name Stage Failure
failed
test Test
Test Suites: 3 failed, 14 passed, 17 total
Tests: 3 failed, 73 passed, 76 total
Snapshots: 30 passed, 30 total
Time: 7.634s
Ran all test suites.
npm ERR! Test failed. See above for more details.
Makefile:80: recipe for target 'test-js' failed
make: *** [test-js] Error 1
ERROR: Job failed: exit code 1