Merge pull request #6795 from annando/limits