Revision ba6e5a57c35bf56c5bc99187c67d58b931715d0e

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

Merge remote-tracking branch 'upstream/2.4'