Commit bebd2017370294a468ed6cf02c9de35973a9e4f7

Edward Thomson 2015-02-05T14:10:25

Merge pull request #2881 from ethomson/clar Update clar to d17c7f6