Merge branch 'develop' into lbudginas/#568_witness_proxy_votes_issue