Merge pull request #1 from willtp87/7.x

merge at risk
Merge pull request #2 from willtp87/7.x

Merge from Will.
Merge pull request #3 from willtp87/7.x

coder
Merge pull request #4 from willtp87/7.x

stuff for Jordan
Batch updating appears to be done, needs to poke.
Merge pull request #5 from jordandukart/7.x

gmhxgchm