A bunch of upstream changes from the 14.06 and (probable) 14.11 Groupserver Releases