Fixed upstream in commit a9556289f0eea748e510edc3680e67395c876ed8
For the latest 0.6 branch, also commit 0efa72740f73479428a4a3e0056e04ff013e980f is needed.
Fixed upstream in commit a9556289f0eea74 8e510edc3680e67 395c876ed8
For the latest 0.6 branch, also commit 0efa72740f73479 428a4a3e0056e04 ff013e980f is needed.