Merge pull request #3163 from StevenPuttemans:fix_nonfree_items
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 29 Aug 2014 08:08:52 +0000 (08:08 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 29 Aug 2014 08:08:52 +0000 (08:08 +0000)

Trivial merge