Caught up with 1.6.1.

The only forked change now is the addition of ajaxHeader support.