See issue #390.
:thumbsup: this one looks good to me!
rebased onto 614734543df96e8cd36e761a8d59844d57a57bf9
Pull-Request has been merged by abompard
See issue #390.