2013.07 - bugzids 3437 and 3400