Merge branch release-2016 into release-2018
authorMark Abraham <mark.j.abraham@gmail.com>
Wed, 14 Feb 2018 12:54:33 +0000 (13:54 +0100)
committerMark Abraham <mark.j.abraham@gmail.com>
Wed, 14 Feb 2018 12:54:52 +0000 (13:54 +0100)
This patch has already been incorporated into release-2018

Change-Id: I088c0d44b5620b3eb575e8a1d0a05adeefaee2cc


Trivial merge