Commit to master.

All current changes being put into master.