Merge pull request #147 from antonblanchard/diamond-1
authorAnton Blanchard <anton@linux.ibm.com>
Thu, 23 Jan 2020 03:36:15 +0000 (14:36 +1100)
committerGitHub <noreply@github.com>
Thu, 23 Jan 2020 03:36:15 +0000 (14:36 +1100)
Some Diamond fixes


Trivial merge