Merge pull request #4778 from akallabeth/2_0_0_dev_4
authorakallabeth <akallabeth@users.noreply.github.com>
Wed, 1 Aug 2018 13:59:34 +0000 (15:59 +0200)
committerGitHub <noreply@github.com>
Wed, 1 Aug 2018 13:59:34 +0000 (15:59 +0200)
Started next development cycle


Trivial merge