Pushed to upstream

cc/ @sergiogonzalez.  Fix JSPC