Merge branch 'master' into mt-trace

diff --cc CMakeLists.txt
Simple merge

diff --cc retrace/glretrace_egl.cpp
index 79b16217b5b51f81bca0ce0f8a799bae02d0c07d,10c950b038d4f398457162c3caa086fc17d728c9..45855643f5b55272e494be1bcef8a799e26c928f
--- 1/retrace/glretrace_egl.cpp
--- 2/retrace/glretrace_egl.cpp
+++ b/retrace/glretrace_egl.cpp
@@@ -203,7 -202,10 +203,11 @@@ static void retrace_eglDestroyContext(t
      it = context_map.find(orig_context);
  
      if (it != context_map.end()) {
-         delete it->second;
++        glretrace::Context *currentContext = glretrace::getCurrentContext();
+         if (it->second != currentContext) {
+             // TODO: reference count
+             delete it->second;
+         }
          context_map.erase(it);
      }
  }