Alexandre Julliard : Merge branch 'upstream'