Fixed: conflict accommodation in metabox
Merge remote-tracking branch 'origin/master'

Conflicts:
	library/metaboxes/meta-options.php