#153. Backmerge with master. Fixed metabox.