Revision 3ef783a11ffde640dd1022b338bd03ec05aea1cc

Committed on 18/02/2019 1:51 am by André R <[email protected]> [GitHub Diff]

Merge branch '1.5'