Bug 1054578: Don't use temporary files when possible. Make sure and package the right icons.
Bug 1056283 - add resolve.require
Merge pull request #1591 from Mossop/bug1054578

Bug 1054578: Don't use temporary files when possible. r=gozala
Merge pull request #1596 from jsantell/1056283

Bug 1056283 - add require.resolve, r=@erikvold
Bug 1057846 - Create add-on author test that confirms using '<' and '>' characters work
Merge pull request #1598 from erikvold/1057846

Bug 1057846 - Create add-on author test that confirms using '<' and '>' characters work r=@jsantell
Bug 1058091 - FATAL ERROR: Non-local network connections are disabled and a connection attempt to tiles.up.mozillalabs.com (54.243.106.119) was made.
Merge pull request #1599 from Mardak/master

Bug 1058091 - FATAL ERROR: Non-local network connections are disabled and a connection attempt to tiles.up.mozillalabs.com (54.243.106.119) was made. r=@erikvold