Merge branch 'v3.0.x' into patch-3
authorAlan Buxey <alan.buxey@gmail.com>
Tue, 9 May 2017 11:28:07 +0000 (12:28 +0100)
committerGitHub <noreply@github.com>
Tue, 9 May 2017 11:28:07 +0000 (12:28 +0100)

Trivial merge