Merge branch 'HF_Echidna' of github.com:neo-project/neo into HF_Echidna

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.