Update for the sampling/mag/stride label.  Hopefully, this is a new
branch.
Merge branch 'master' into sampling
Merge branch 'sampling'