Hernan Ponce de Leon authored Jun 07, 2018 and Alexander Diewald committed Jun 07, 2018

Issue-Ref:3427
Signed-off-by: Hernan Ponce de Leon <ponce@fortiss.org>