Merge pull request #1523 from shackbarth/wotest