Commit for NerdDinner/2.2