Merge pull request #247 from annando/1503-libertree-source