Merge pull request #2113 from freeform/CRM-13853