Merged from beta.

Preparing to merge test back into master.