Updates from master

@alexindigo these changes should resolve the merge conflict so we can merge airbnb/rendr#190.