Commit c23002c5608037957faf13e21adeb214b01fe30e

Carlos Martín Nieto 2015-03-01T21:04:51

Merge pull request #2929 from ethomson/clar_update Update to clar 2b73f5e