Revision 08fcd2111e505a312f30ac7a376a47170c25b139

Committed on 22/01/2018 7:43 am by André R <[email protected]> [GitHub Diff]

Merge branch '1.4'