Merge branch '1.3' into eas-1.3.2-to-master

Conflicts:
	src/riak_core_vnode_worker.erl