Merged revision 8135 to from mac_osx to kicklib branch. (part 2) (Shouldn't have updated to TortoiseSVN 1.6.15…)