Merge tag 'upstream/1.1.1'
authorSven Hoexter <sven@stormbind.net>
Sun, 19 Apr 2015 11:40:35 +0000 (13:40 +0200)
committerSven Hoexter <sven@stormbind.net>
Sun, 19 Apr 2015 11:40:35 +0000 (13:40 +0200)
Upstream version 1.1.1


Trivial merge