Merge pull request #10142 from alalek:pytests_update
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 23 Nov 2017 12:51:55 +0000 (12:51 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 23 Nov 2017 12:51:55 +0000 (12:51 +0000)

Trivial merge