Commit for NerdDinner/2.4