fix for linux compilation issues.
Merge branch 'master' of https://github.com/BitShares/bitshares_toolkit