Revision 09f15d20305e9c5b5bc7abe9fc26b4cae36b8509

Committed on 12/01/2018 3:15 am by André R <[email protected]> [GitHub Diff]

Merge branch '1.4'