More promises instead of callbacks.
Merge branch 'master' of github.com:discourse/discourse
More promises instead of callbacks.