Merged.

diff --combined src/threads/thread.cpp
index 57f8b5c0b1c862b3c8b342d0d74c4eb8d1f5991c,3cad59663bb13114e129be8fbcef0585dc1735bc..fefb4a34f662c6465c63b023f1d3416ccf01a849
--- 1/src/threads/thread.cpp
--- 2/src/threads/thread.cpp
+++ b/src/threads/thread.cpp
@@@ -51,7 -51,7 +51,7 @@@
  #include "vm/exceptions.hpp"
  #include "vm/globals.hpp"
  #include "vm/javaobjects.hpp"
 -#include "vm/method.h"
 +#include "vm/method.hpp"
  #include "vm/options.h"
  #include "vm/string.hpp"
  #include "vm/utf8.h"
@@@ -1192,6 -1192,8 +1192,8 @@@ bool threads_thread_is_alive(threadobje
        case THREAD_STATE_BLOCKED:
        case THREAD_STATE_WAITING:
        case THREAD_STATE_TIMED_WAITING:
+       case THREAD_STATE_PARKED:
+       case THREAD_STATE_TIMED_PARKED:
                return true;
  
        default: