7.x-2.2

Roberto Peruzzo

@robertoperuzzo

c928c02f · Merge branch 'issue-2888760' into 7.x-2.x · Jul 06, 2018

Fixed issues #2888760 and #2830034.