11/30/14 commit

11/30/14 commit