Merge pull request #3157 from PhilLab:pnpFix
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 25 Aug 2014 18:11:10 +0000 (18:11 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 25 Aug 2014 18:11:10 +0000 (18:11 +0000)

Trivial merge