Don't force 'file' link type if 'none' was set
Merge pull request #3 from SergeyBiryukov/master

Don't force 'file' link type if 'none' was set