Revision 326a78d1d04d7c605542ac405ba0ff71c4467d5e

Committed on 12/04/2019 7:05 am by m-tyrala <tyrala.maciej@gmail.com> [GitHub Diff]

Merge branch '2.4'

# Conflicts:
# .travis.yml