Fix failing test.
Merge branch 'refs/heads/master' into apply-matrix