Commit 263e674ec6701b774d8f464150a9d30650c6da46

Edward Thomson 2016-02-11T11:41:23

merge tests: correct casts