Merge remote-tracking branch 'origin/pr/1191'
authorMarc Fournier <marc.fournier@camptocamp.com>
Mon, 3 Aug 2015 21:27:10 +0000 (23:27 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Mon, 3 Aug 2015 21:27:10 +0000 (23:27 +0200)

Trivial merge