backport of selected features and bug fixes from 2.0 to 1.4.
Merge pull request #133 from basho/1.4.9

1.4.9