Merge remote-tracking branch 'upstream/7.0' into 7.0-travis
authorHolger Brunn <hbrunn@therp.nl>
Mon, 28 Jul 2014 08:45:22 +0000 (10:45 +0200)
committerHolger Brunn <hbrunn@therp.nl>
Mon, 28 Jul 2014 08:45:22 +0000 (10:45 +0200)

Trivial merge