This is fixed in master and should be in rc2.
Created attachment 7969 [details] patch from master
*** This bug has been marked as a duplicate of bug 9185 ***