R1:bf2422afc840

Merge pull request #104 from jeffmo/master

Pull request for D2025 (fix phabricator linter regex issue)