Merge remote-tracking branches 'github/merge-requests/581', 'github/merge-requests...
authorKlaus Ethgen <Klaus@Ethgen.de>
Mon, 22 Jan 2018 20:07:11 +0000 (21:07 +0100)
committerKlaus Ethgen <Klaus@Ethgen.de>
Mon, 22 Jan 2018 20:07:11 +0000 (21:07 +0100)
* github/merge-requests/581:
  Fix crash after strange behaviour of the "Really Continue" dialog

* github/merge-requests/576:
  Trap build errors

* github/merge-requests/574:
  Fix spelling mistake occured/occurred

* github/merge-requests/573:
  Partially fix #561: Hi-DPI-aware rendering of images.


Trivial merge