Merge remote-tracking branch 'watchdog/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 02:04:22 +0000 (13:04 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 02:04:22 +0000 (13:04 +1100)

Trivial merge