Bug 993029: Tag the SDK console with the add-on ID.
Bug 1005488 - Deprecate sdk/content/content
Bug 851145 - Refactor isPrivate method to use the method module
Merge pull request #1471 from erikvold/851145

Bug 851145 - Refactor isPrivate method to use the method module r=@gozala
Merge pull request #1479 from Mossop/bug993029

Bug 993029: Tag the SDK console with the add-on ID. r=gozala
Bug 999585 - wantExportHelpers for all content-script. r=Mossop
Merge pull request #1482 from jsantell/1005488-remove-content-content

Fix Bug 1005488 - Deprecate sdk/content/content, r=@zombie
bug 1006043 - hack around lingering child process
Merge pull request #1485 from zombie/1006043-double-kill

bug 1006043 - hack around lingering child process, r=@Mossop
Bug 1010344.  Don't do deep compares on window objects in addon SDK tests, since that's not a very useful thing to do and can go into infinite loops.  r=mossop
Bug 810654: Added 'exclude' option to PageMods.
Merge pull request #1489 from cbrem/master

Bug 810654 Added 'exclude' option to PageMod., r=@jsantell