Merge branch 'master' into stop_child_fix
Use \r\n instead of \n for fprintf.
Merge branch 'stop_child_fix' into application_stop_fix
Merge branch 'application_stop_fix' into make_mac_compile_hack