Merge changes from master (tunk) into beta

sucs-site (live) is ahead of beta :/

Pushing merge changes (the new fancy way) from master (trunk) into the beat branch.