Merge branch 'require-c99' into 'master'