r816 www/trunk