Alexandre Julliard : Merge branch 'upstream'.

[Alexandre Julliard]

Module: bugzilla
Branch: master
Commit: caf6a1349e1d7e4a279eb8da2fb9308a2f7752a8
URL:    http://source.winehq.org/git/bugzilla.git/?a=commit;h=caf6a1349e1d7e4a279eb8...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Fri Sep 11 19:58:22 2015 +0900

Merge branch 'upstream'.

---