Merge commit '7ca1bde483e7fac5254dc25bc14af58a3184328f' into feature/rackup

* commit '7ca1bde483e7fac5254dc25bc14af58a3184328f':
  now we have working sourcemaps