merging issue: EmailMarketing.php from hotfix
merging issue: EmailMarketing.php from hotfix

salesagility/SuiteCRM,lionixevolve/SuiteCRM,MikeyJC/SuiteCRM,horus68/SuiteCRM-Horus68,daniel-samson/SuiteCRM,lionixevolve/LionixCRM,ChangezKhan/SuiteCRM,JanSiero/SuiteCRM,samus-aran/SuiteCRM,lionixevolve/LionixCRM,salesagility/SuiteCRM,cumanacr/SuiteCRM,gody01/SuiteCRM,Dillon-Brown/SuiteCRM,lionixevolve/SuiteCRM,samus-aran/SuiteCRM,gody01/SuiteCRM,Dillon-Brown/SuiteCRM,JanSiero/SuiteCRM,horus68/SuiteCRM-Horus68,gcoop-libre/SuiteCRM,gody01/SuiteCRM,JanSiero/SuiteCRM,dfstrauss/SuiteCRM,Dillon-Brown/SuiteCRM,JanSiero/SuiteCRM,gcoop-libre/SuiteCRM,pribeiro42/SuiteCRM,lionixevolve/LionixCRM,pribeiro42/SuiteCRM,ChangezKhan/SuiteCRM,dfstrauss/SuiteCRM,gody01/SuiteCRM,lionixevolve/LionixCRM,ChangezKhan/SuiteCRM,dfstrauss/SuiteCRM,Dillon-Brown/SuiteCRM,willrennie/SuiteCRM,samus-aran/SuiteCRM,salesagility/SuiteCRM,samus-aran/SuiteCRM,JimMackin/SuiteCRM,lionixevolve/LionixCRM,lionixevolve/SuiteCRM,lionixevolve/SuiteCRM,ChangezKhan/SuiteCRM,horus68/SuiteCRM-Horus68,willrennie/SuiteCRM,cumanacr/SuiteCRM,MikeyJC/SuiteCRM,JimMackin/SuiteCRM,pribeiro42/SuiteCRM,horus68/SuiteCRM-Horus68,cumanacr/SuiteCRM,daniel-samson/SuiteCRM,pribeiro42/SuiteCRM,salesagility/SuiteCRM,daniel-samson/SuiteCRM,MikeyJC/SuiteCRM,lionixevolve/LionixCRM,willrennie/SuiteCRM,cumanacr/SuiteCRM,gcoop-libre/SuiteCRM,daniel-samson/SuiteCRM,gcoop-libre/SuiteCRM,dfstrauss/SuiteCRM,MikeyJC/SuiteCRM,JimMackin/SuiteCRM,JimMackin/SuiteCRM,willrennie/SuiteCRM