jenkins-bot submitted this change.

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

Merge branch 'master' into stable

Change-Id: Ifef4a7a92d3dadf230b7a4909dcd738801cb6b8c
---
1 file changed, 291 insertions(+), 0 deletions(-)

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