Merge pull request #7043 from alalek:add_nonfree_flag
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 8 Aug 2016 15:18:49 +0000 (15:18 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 8 Aug 2016 15:18:49 +0000 (15:18 +0000)

Trivial merge