Add test for empty inclusion
Merge remote branch 'wagn/develop' into develop
Merge remote branch 'wagn/develop' into develop
First cut at mail fixes
Merge remote-tracking branch 'gerry/develop' into develop
Merge remote-tracking branch 'gerry/mailerpatch' into develop
getting account emails working