Merge remote-tracking branch 'upstream/develop' into develop
+ Add Scan Settings to BinaryFileType
Merge pull request #736 from tcavaletto/develop

Develop