Potential fix for #838 and #839
Merge branch 'develop' of github.com:BitShares/bitshares_toolkit into develop