Develop

Some recent changes upstream.