Refactoring libmarpa: t+
Fall back to two commits ago

Merge branch 'master' into fallback
Used "ours" strategy
Refactoring libmarpa: t+