Will do.  In general, should I be submitting PRs against the 4.0 branch, or master?