Code commits

Openfire (master)