Fixed & verified upstream in trunk. Someone may have to backport the 2 commits fixing this (00091a2 & 0a7968a)
Fixed & verified upstream in trunk.
Someone may have to backport the 2 commits fixing this (00091a2 & 0a7968a)