fix message about no more items
Merge branch 'master' into jetty7