Merge branch 'v3.0.x' into v3.0.x
authorArran Cudbard-Bell <a.cudbardb@freeradius.org>
Sat, 5 Nov 2016 19:20:48 +0000 (15:20 -0400)
committerGitHub <noreply@github.com>
Sat, 5 Nov 2016 19:20:48 +0000 (15:20 -0400)

Trivial merge