Merge tag 'upstream/1.2.1'
authorSven Hoexter <sven@stormbind.net>
Wed, 7 Oct 2015 09:53:52 +0000 (11:53 +0200)
committerSven Hoexter <sven@stormbind.net>
Wed, 7 Oct 2015 09:53:52 +0000 (11:53 +0200)
Upstream version 1.2.1


Trivial merge