Final spring 2013 commit