Account for diff format in is-this-recurring method
Merge remote branch 'origin/7.x-3.0-qa' into 7.x-3.0-qa