Bug #3939 PHP NavigationTree error when paging through list
ChangeLog entry for fix of bug #3939
Fix merge conflicts