Merge branch 'v3.0.x' into v3.0.x
authorStefan Paetow <spaetow@users.noreply.github.com>
Sat, 20 May 2017 20:05:56 +0000 (21:05 +0100)
committerGitHub <noreply@github.com>
Sat, 20 May 2017 20:05:56 +0000 (21:05 +0100)

Trivial merge