Issue #347: Use a fork of a fork (kostajh's branch for fixing D6 integration)