Merge pull request from BitShares/master

merge from bitshares