Stephane Nicoll ff3fe7a09f Merge branch '1.5.x'

2017-10-28 07:53:56 +02:00

..

main

Merge branch '1.5.x'

2017-10-28 07:53:56 +02:00

test

Update copyright year for changed files

2017-10-10 11:56:13 -07:00