make period labels optional in forms
Merge branch 'master' into staging