Incorporate velvet R15 compatibility change
Merge pull request #104 from basho/bugfix/velvet-r15-compatibility

Incorporate velvet R15 compatibility change