Stephane Nicoll ef80772b92 Merge branch '1.5.x'

2017-10-20 17:31:44 +02:00

..

main

Merge branch '1.5.x'

2017-10-20 17:31:44 +02:00

test

Update copyright year for changed files

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