Stephane Nicoll a8e0b0dd4e Merge branch '1.5.x'

2017-10-20 08:42:17 +02:00

..

main

Merge branch '1.5.x'

2017-10-20 08:42:17 +02:00

test

Update copyright year for changed files

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