b=927719; DEVELOPER_OPTIONS set too late; r=gps
b=927727; support OpenGL OMTC layers on Windows; r=bgirard
Bug 909048 - Don't set "index" property on session history when not needed (r=ttaubert)
Bug 910668 - Add code to collect frames to restore (r=ttaubert)
Bug 910668 - Move pagestyle collection to a module (r=ttaubert)
Bug 910668 - Collect pagestyle from a content script (r=ttaubert)
Bug 909048 - Move text and scroll data handling to a module (r=ttaubert)
Bug 909048 - Collect text and scroll data from content script (r=ttaubert)
Automatic merge
Automatic merge