Merge branch master of https://github.com/github/developer.github.com into contents_crud