Merge branch 'master' into gas-dynamics