Merge branch 'master' into girocco