Merge from BitShares/master

Merge from BitShares/master