Merge branch 'evolution_bdm' into 'ticket_1738'

# Conflicts:
#   members_space/static/js/members-space-my-shifts.js
2 jobs from ticket_1738 in 1 minute 33 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed #2221
lint:js

00:24

passed #2222
unit:django

01:09