Issue #2341679 by slashrsm: Chase HEAD + fix tests.
Merge pull request #9 from slashrsm/2341679

Chase HEAD