merge

Some changes were committed to the master branch directly; this merge brings beta up to date