fix missed merge error
Merge pull request #1408 from swryan/caltesting

fix missed merge error