Merge branch release-5-1 into release-2016
authorMark Abraham <mark.j.abraham@gmail.com>
Thu, 12 May 2016 22:07:37 +0000 (00:07 +0200)
committerMark Abraham <mark.j.abraham@gmail.com>
Thu, 12 May 2016 22:07:37 +0000 (00:07 +0200)
Change-Id: I4195829e82c50f3d0aa04644a99ae53beb2e24c3


Trivial merge