Merge "Allow org.mockito.Matchers.* as a static import"