Merge changes from upstream and fix _limit()