Minor cleanup related to #949
Merge branch 'develop' of github.com:BitShares/bitshares into develop