Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	packages/binary/valuetransfer/transaction/transaction.go

packages/binary/valuetransfer/tangle/tangle.go

@@ -70,7 +70,7 @@ func (tangle *Tangle) AttachPayload(payload *payload.Payload) {
 	tangle.storePayloadWorkerPool.Submit(func() { tangle.storePayloadWorker(payload) })
 }
 
-// GetDataPayload retrieves a payload from the object storage.
+// GetPayload retrieves a payload from the object storage.
 func (tangle *Tangle) GetPayload(payloadId payload.Id) *payload.CachedPayload {
 	return &payload.CachedPayload{CachedObject: tangle.payloadStorage.Load(payloadId.Bytes())}
 }