CE upstream: Thursday
Conflicts:
both modified: app/assets/javascripts/dispatcher.js
both modified: app/views/admin/dashboard/index.html.haml
both modified: spec/javascripts/user_callout_spec.js
both modified: spec/services/boards/issues/list_service_spec.rb