Merge pull request #7698 from alalek:backport_perf_gabor
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 21 Nov 2016 14:42:54 +0000 (14:42 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 21 Nov 2016 14:42:54 +0000 (14:42 +0000)

Trivial merge