Fixes for LifeLines
Fix test
Revert to 1.6
Merge pull request #1428 from erwinwinder/master

Fixes for LifeLines