Revision 07f1317927724de99ff6194497e6fd8b3c4391c7

Committed on 14/02/2019 6:30 am by Marek Nocon <[email protected]> [GitHub Diff]

Merge branch '2.3' into 2.4