Revision ccbfea892f854f8694206799ae3bcdef32eb94e7

Committed on 10/08/2018 7:54 am by André R <[email protected]> [GitHub Diff]

Merge branch '1.4'