Partial orchidectomy: removed (some of) Jeffrey's balls.
Merge branch 'master' of https://github.com/worklist/hifi
Merge pull request #1230 from ey6es/master

Partial orchidectomy: removed (some of) Jeffrey's balls.