672c9f5f05
Conflicts: - `app/helpers/application_helper.rb`: Conflict due to our theming system being different. Ported upstream's changes.
0cea7a623b