Fixes a broken style in a field in the admin
Merge branch 'master' into staging