Merge r715 from trunk:  Don't crash if the client fails to
provide a skip function.  Trunk has also added a test for
this which I didn't merge.

SVN-Revision: 716
1 file changed