Update quickstart from master