Add missing $window dependency
Merge branch 'heroku'