Revision 533d99d9006e64b345faec283b17c87ef2a26b7b

Committed on 15/01/2019 5:04 am by Adam Wójs <adam@wojs.pl> [GitHub Diff]

Merge remote-tracking branch 'upstream/2.3' into 2.4