rebased onto 933f5365bf9c78c7679e821ecac371fcc76c2a5f
rebased onto 79c7ede1c7b60c55f1d0f479a0c049a82158125e
@jflory7 @bex @skamath, please review.
Sorry for the late response. Just seeing this PR. Looks good to me, merging.
@bex Could you rebuild the docs site after this merges?
Pull-Request has been merged by jflory7