Some work was stomped on from my last commit.
Merge branch '7.x.cwrc-51' of https://github.com/MorganDawe/cwrc_workflow into 7.x.cwrc-51