rails41 / 42

@zendesk/octo 

### Risks
 - None