Merge remote-tracking branch 'security/next-testing'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 10 Dec 2018 03:55:20 +0000 (14:55 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 10 Dec 2018 03:55:20 +0000 (14:55 +1100)

Trivial merge