Fix for http://core.tcl.tk/tk/info/8eb56719cf on broken build with 8.5.15 with clang on OS X, thanks to Ned Deily for patch
merge-mark
merge trunk; update changes