Merge remote branch 'remotes/uzbl/master'