Fixed restack for battle pets (thx to strattonw).
Improved FeastsAndPortals.
Merge remote-tracking branch 's/master'