Merge pull request #6928 from remitamine/cnet
authorremitamine <remitamine@gmail.com>
Sun, 20 Dec 2015 11:59:35 +0000 (12:59 +0100)
committerremitamine <remitamine@gmail.com>
Sun, 20 Dec 2015 11:59:35 +0000 (12:59 +0100)
[cnet] fix extraction and extract more formats and metadata(closes #7003)


Trivial merge