Update master with latest 1.0 work.