Upstream from imvu

This brings some changes from IMVU back upstream.