Patch was merged upstream. Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com> (cherry-picked from commit 8bdb697671 )
8bdb697671