Bug 960270 - Streamline Editor API. r=msucan