jenkins-bot submitted this change.

Approvals:
  Xqt: Looks good to me, approved
  jenkins-bot: Verified

Merge branch 'master' into stable

Change-Id: I83e1efacfc0076341cc6b3754ce4f01c4f635cef
---
1 file changed, 22 insertions(+), 0 deletions(-)

To view, visit change 973382. To unsubscribe, or for help writing mail filters, visit settings.