C11++
Merge branch 'master' into Edgar