include files changed to fix compilation bug with g++ c++-11 features turned on
Merge remote-tracking branch 'origin/master'