Alexandre Julliard : Merge branch 'upstream'.

[Alexandre Julliard]

Module: bugzilla
Branch: master
Commit: 68fa9518d63526c152bc72a6c3365e32dfdc866d
URL:    https://source.winehq.org/git/bugzilla.git/?a=commit;h=68fa9518d63526c152bc7...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Sat Feb 17 16:00:54 2018 +0100

Merge branch 'upstream'.

Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---