github/linguist — pull request #1120 by arfon (2014-04-24 18:35:05+00:00)
Title: 1116 1117 update

Combined #1117 and #1116 branch.