richfitz Merge pull request #494 from mrc-ide/wes/i493