Minor naming and markup change to panel shortcode
Merge branch 'panel-shortcode' into 1.1.0-wip