Stephane Nicoll edc43f75cb Merge branch '1.5.x'

2018-01-01 08:30:03 +01:00

..

main

Merge branch '1.5.x'

2018-01-01 08:30:03 +01:00

test

Fix bean names in tests

2017-12-14 12:30:13 -08:00