Merge branch 'jk/limit-developers-to-gnu99'