Merged changes from Recurly