Merged in boxed theme 1.1.3