Merge pull request #3629 from nstiurca:matx-fix
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 22 Jan 2015 09:43:33 +0000 (09:43 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 22 Jan 2015 09:43:33 +0000 (09:43 +0000)

Trivial merge