Single squashed commit for converting master into beta

See branch beta-dev for individual commits