CoffeeScript fix (~1.7.0)

Pulling the CoffeeScript fix from master to beta