Merge pull request #6996 from juliendehos:merge_debevec
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 28 Jul 2016 11:51:12 +0000 (11:51 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 28 Jul 2016 11:51:12 +0000 (11:51 +0000)

Trivial merge