Phillip Webb 962313d0e1 Merge branch '1.5.x'

2017-01-05 16:30:34 -08:00

..

main

Fix Mockito 2 support

2017-01-05 16:27:41 -08:00

test

Merge branch '1.5.x'

2017-01-05 16:30:34 -08:00