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)
commitbf7caf5f79185a7c4da23f951f89b514ec607564
tree8dae7382935d4d6b859ef8bf7885ef89917f29dd
parent36f8d6cbb74a76081e377417c223917b1e765b0e
parent387540dc4401298eac7c545a9ba94f2488fa3cae
Merge branch 'v3.0.x' into v3.0.x