Merge release 0.7.4 into iainrb/devel