Merge branch 'develop' into issue1593-2

diff --cc common.h
index ecf0731,980099e..cd1c4c0
--- 1/common.h
--- 2/common.h
+++ b/common.h
@@@ -662,8 -657,8 +663,7 @@@ __declspec(dllimport) int __cdecl omp_g
  #ifndef _Atomic
  #define _Atomic volatile
  #endif
 -#endif
  
- 
  #else
  #ifdef __ELF__
  int omp_in_parallel  (void) __attribute__ ((weak));