[MERGE] forward port of branch saas-5 up to revid 587084f
authorChristophe Simonis <christophe@kn.gl>
Sun, 1 Jun 2014 09:21:35 +0000 (11:21 +0200)
committerChristophe Simonis <christophe@kn.gl>
Sun, 1 Jun 2014 09:21:35 +0000 (11:21 +0200)

Trivial merge