Allowed values for panelizer
Merge branch 'james'
Merge branch 'master' into test