Revision 9d89a5128f87c823bbd0540b25f89f235b6774be

Committed on 05/07/2018 10:59 pm by Dariusz Szut <dew326@gmail.com> [GitHub Diff]

Merge remote-tracking branch 'origin/1.7' into 1.13