Fix syntax for extra-fields.
Merge branch 'master' into deploy-test