Merge remote-tracking branch 'origin/7.0' into 7.0-lp1303829
authorHolger Brunn <hbrunn@therp.nl>
Mon, 15 Sep 2014 08:38:11 +0000 (10:38 +0200)
committerHolger Brunn <hbrunn@therp.nl>
Mon, 15 Sep 2014 08:38:11 +0000 (10:38 +0200)

Trivial merge