Refs #5695 - Branch swapped back to master