Merge pull request #8688 from ysolovyov:num-jobs-fix
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 3 May 2017 10:25:54 +0000 (10:25 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 3 May 2017 10:25:54 +0000 (10:25 +0000)

Trivial merge