Merge in my change to a regex from 474aaf6c11

This better handles the two different Forward template formats.