Pull master into experimental

Pulling the up-to-dated branch master into experimental