Changes from maxclaims branch (git).