Merge branch 'v3.0.x' into patch-3
authorArran Cudbard-Bell <a.cudbardb@freeradius.org>
Thu, 11 May 2017 10:50:55 +0000 (06:50 -0400)
committerGitHub <noreply@github.com>
Thu, 11 May 2017 10:50:55 +0000 (06:50 -0400)

Trivial merge