Merge branch 'jc/c99-var-decl-in-for-loop'