remove 1000 story limit
Merge branch 'master' into RELEASE_20130723