Stephane Nicoll a22b3d9515 Merge branch '1.4.x' into 1.5.x

2017-05-12 17:27:28 +02:00

..

main

Merge branch '1.4.x' into 1.5.x

2017-05-12 17:27:28 +02:00

test

Update copyright header dates

2017-05-09 21:43:52 -07:00