Update !394 and resolve its conflicts

Is this a bug? Make sure to use the Bug template above and be as detailed in your report as possible.

added StatusInProgress + 1 deleted label

assigned to @eiennohi

added 1 deleted label

changed weight to 2

added StatusReview label and removed StatusInProgress label

added 2h of time spent at 2019-12-05

mentioned in merge request !394 (merged)

added 1 deleted label

added StatusBacklog label and removed StatusReview label

added StatusBlocked label and removed StatusBacklog label

Needs @markeharding to merge it in and to elevate my permissions so I can get these approved MRs merged in

added StatusRequires Changes + 1 deleted label and removed StatusBlocked + 1 deleted label

added 1h of time spent at 2019-12-17

added 1 deleted label and removed StatusRequires Changes label

added StatusRequires Changes label and removed 1 deleted label

added 1 deleted label and removed 1 deleted label

added 1 deleted label and removed StatusRequires Changes label

added 10m of time spent at 2019-12-19

added 1 deleted label and removed 1 deleted label

changed milestone to %Sprint::01/01 - Xerothermic Xenartha

added 1 deleted label and removed 1 deleted label

added 1 deleted label and removed 1 deleted label

assigned to @omadrid

added StatusReview label and removed 1 deleted label

added 1 deleted label and removed StatusReview label

unassigned @omadrid

added StatusReview label and removed 1 deleted label

added 1 deleted label and removed StatusReview label

added 1 deleted label and removed 1 deleted label

closed via merge request !394 (merged)

mentioned in commit 2cb1c987