Merge branch '1.5.x'

This commit is contained in:
Stephane Nicoll
2016-09-27 10:14:57 +02:00
2 changed files with 4 additions and 3 deletions