merging hotfixes (reverting chick-fil-a run) to dev #395

Closed jadesym closed 8 years ago