b451b66b40
Credits: Thanks go to Andreas Hruska [https://github.com/ahruska] for the original patch for this issue.
Credits: Thanks go to Andreas Hruska [https://github.com/ahruska] for the original patch for this issue.