vissarion Merge pull request #1152 from vissarion/fix/cxx11_macros