Merge branch release-5-1 into release-2016
authorMark Abraham <mark.j.abraham@gmail.com>
Mon, 3 Oct 2016 15:09:57 +0000 (17:09 +0200)
committerMark Abraham <mark.j.abraham@gmail.com>
Mon, 3 Oct 2016 15:10:31 +0000 (17:10 +0200)
Change-Id: I38cba3159387519af07195a5995b0986dac5a2d6


Trivial merge