Allowed values for panelizer
Merge branch 'james'