Finished merge with latest changes to master.