Merge remote-tracking branch 'freedesktop/master'