Merge master into riak2 branch

This will merge all current master changes into riak2 branch.