Commit 423e3b0c4838537608bede2c166abd3b589dd23c

Ben Straub 2013-08-12T11:02:53

Update to clar 7bf638b80