Equipment (including Mozilla's contribution)
Merge pull request #65 from gvwilson/master

Equipment (including Mozilla's contribution)