Merge tag 'upstream/1.1.0'
authorSven Hoexter <sven@timegate.de>
Mon, 25 Aug 2014 17:47:51 +0000 (19:47 +0200)
committerSven Hoexter <sven@timegate.de>
Mon, 25 Aug 2014 17:47:51 +0000 (19:47 +0200)
Upstream version 1.1.0


Trivial merge