Merge branch 'issue/missmatched-new-delete' into 'master'
Fix error "delete called on pointer returned from a mismatched allocation function"
See merge request !542
(cherry picked from commit 497d5223)
eb67c9c9 Fix error "delete called on pointer returned from a mismatched allocation function"