Merge remote-tracking branch 'upstream/account_transfer' into next
Merge remote-tracking branch 'upstream/next' into next
Merge remote-tracking branch 'upstream/account_transfer' into next
fix setting node type to message
Merge pull request #64 from mmoadeli/MAID-448

Maid 448