Merge branch 'upstream/master' into master
authorSébastien CHAZALLET <s.chazallet@gmail.com>
Thu, 27 Nov 2014 10:25:38 +0000 (11:25 +0100)
committerSébastien CHAZALLET <s.chazallet@gmail.com>
Thu, 27 Nov 2014 10:25:38 +0000 (11:25 +0100)

Trivial merge