Bug 951975 - Expose Editor.setOption and Editor.getOption. r=msucan
Bug 957160 - DevTools Themes: Use 2x icon for split console on tab bar - part 2;r=pbrosset
Merge fx-team to m-c