Merge branch 'master' into add-elementwise-reductions