nlf/riakpbc — pull request #56 by oleksiyk (2014-03-17 18:17:45+00:00)
Title: Merge master into riak2 branch

This will merge all current master changes into riak2 branch.