Adapt previous ui mod to stay Qt4-compliant (fixes #15)
Merge remote-tracking branch 'upstream/master'