fixed a macro issue for GCC
Merge branch 'master' into beta-6.2