nginx devel 1.3.16 and trunk

This updates nginx devel to 1.3.16 as well as HEAD.