Merging changes from master
Fixed cukes for OCP, LSP and ISP talks after Firefox 32 release