bugfix
Merge branch 'thursday8pm' into develop