Get upstream

All the changes from 35.2, present upstream version. Changed metadata.rb to show 35.3 for our purposes.