Merge branch 'master' into stable/arno 79/2179/1 arno.2015.2.0
authorMorgan Richomme <morgan.richomme@orange.com>
Thu, 1 Oct 2015 09:03:09 +0000 (11:03 +0200)
committerMorgan Richomme <morgan.richomme@orange.com>
Thu, 1 Oct 2015 09:03:09 +0000 (11:03 +0200)

Trivial merge