Merge master into dev after release

Pull request #2948 from master to dev
This commit is contained in:
Jacob Støren 2018-05-22 13:05:06 +02:00 committed by GitHub
commit e2ca982b45
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

Diff Content Not Available