Merge pull request #12574 from alalek:fixes_master
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 18 Sep 2018 11:16:24 +0000 (11:16 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 18 Sep 2018 11:16:24 +0000 (11:16 +0000)
commit145d3ba99d896fb366c82e14166ab9d13a3bbd67
tree284b941ef0535b2978d720fbe4a2a318d683ac66
parente6171d17f8b22163997487b16762d09671a68597
parent38de2a875402808fb32afadff17c413222e8cc68
Merge pull request #12574 from alalek:fixes_master