Merge updates from Qupzilla:master