Merge pull request #2585 from vlidholt/master

Initial support for links in markdown