Merge latest from mojombo/master

This just merges master from mojombo/master, which only has one change at the moment.

/cc @github/git @rtomayko