Merge branch release-5-1 into release-2016
authorMark Abraham <mark.j.abraham@gmail.com>
Sun, 3 Sep 2017 14:51:20 +0000 (16:51 +0200)
committerMark Abraham <mark.j.abraham@gmail.com>
Sun, 3 Sep 2017 14:51:20 +0000 (16:51 +0200)
Change-Id: I047ad1ab813b69582bdf5f4681549171724323f6


Trivial merge