Merge branch '1.5.x'

This commit is contained in:
Stephane Nicoll
2018-01-17 15:53:28 +01:00