Testing updates
Merge branch 'stripped' of https://github.com/ibmmxlabs/v17e into stripped