merge

Conflicts:
web/static/toffee.js