jenkins-bot submitted this change.

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

Merge branch 'master' into stable

Change-Id: Ibee5a9084d1a1d63170e3ae430a93cf7df35ed18
---
1 file changed, 69 insertions(+), 0 deletions(-)

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