PN5276 PN5278

Replaces https://github.com/wf2/yui3/pull/3