Merge pull request #1553 from github/1372-local

1372 local
This commit is contained in:
Arfon Smith
2014-09-24 16:45:39 -05:00