Merge branch 'v3.0.x' into v3.0.x
authorAlan Buxey <alan.buxey@gmail.com>
Tue, 1 Nov 2016 20:39:56 +0000 (20:39 +0000)
committerGitHub <noreply@github.com>
Tue, 1 Nov 2016 20:39:56 +0000 (20:39 +0000)

Trivial merge