Fixed in commit 971c5213f7c501d3943bc0ff8db918f1616aa35a which also 
fixed ticket 8695.