Synched with csipsimple master: r2353