5.x noemail noplan

Merged mattwire requested to merge 5.x_noemail_noplan into master

Merge request reports