Merge branch 'master' into per_series