Commit 3e026f1b4597c24848487422eb566a9434b5821d

Ben Straub 2012-07-17T09:00:38

Update master-tip to fix unit test.