Upgrade to Liquid 2.5.2
Merge pull request #1536 from mojombo/liquid-2.5.2

Upgrade to Liquid >= 2.5.2, < 2.6
Update history to reflect merge of #1536