[[ Cocoa ]] Merged in develop (now at 6.6-rc-1)