compatiblity with Washout version 0.10.beta.1
Merge branch 'release/v0.7.1'