Merge tag 'upstream/1.2.3'

Upstream version 1.2.3

1. gpg: Signature made 2017-01-23T11:37:00 CET
2. gpg: using RSA key 30B933D80FCE3D981A2D38FB0C99B70EF4FCBB07
3. gpg: Good signature from "Ondřej Surý <ondrej@sury.org>" [ultimate]
4. gpg: aka "[jpeg image of size 3934]" [ultimate]
5. gpg: aka "Ondřej Surý <ondrej@debian.org>" [ultimate]
6. gpg: aka "Ondřej Surý <ondrej.sury@nic.cz>" [ultimate]
7. Primary key fingerprint: 30B9 33D8 0FCE 3D98 1A2D 38FB 0C99 B70E F4FC BB07