Merge commits 

Most recent changes.