Merge pull request #1116 from colincross/browse