Watermark for 1-4-8
Merge pull request #857 from basho/bc-1-4-8-watermark

Watermark for 1.4.8