Fixes error
Implement SI-style (thin space) thoudands separator
Show bitcoin quantities with full precision, even in the presence of trailing zeros
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/qt/overviewpage.cpp
	src/qt/transactiondesc.cpp
Remove unused fAlign argument from BitcoinUnits::format and friends
Add comments re BitcoinUnits::formatWithUnit/formatHtmlWithUnit
Only remove actualy failed blocks from setBlockIndexValid
Only keep setBlockIndexValid entries that are possible improvements
Do not flush the cache after every block outside of IBD
Reject transactions with excessive numbers of sigops
Set -discover=0 in regtest framework

The regtest framework is local, so often there is no need to
discover our external IP.  Setting -discover=0 in util.py works
around shutdown hang caused by GetExternalIP waiting in recv().
Use unordered_map for CCoinsViewCache with salted hash
Fix semantic typo in state.CorruptionPossible check

state.Invalid() is always false, check should be IsInvalid()

Broken since 942b33a
Add helptexts for -whitelist and rpc prioritisetransaction and switch to bitcoin instead of satoshis
Merge pull request #4494

bc42503 Use unordered_map for CCoinsViewCache with salted hash (Pieter Wuille)
Merge pull request #4505

d4d3fbd Do not flush the cache after every block outside of IBD (Pieter Wuille)
Can't log to debug log before chain params initialized

Add a function `AreBaseParamsConfigured` and use this to check
before writing to the debug log. This avoids assertions when the
application happens to log too early, which happens in the GUI.

Messages logged before the base parameters are configured can be
shown using `-printtoconsole`.
ui: Replace some LogPrintfs with qDebug()

These are relatively unimportant messages, so don't need to be logged
without -debug=ui.
Add vout to ListTransactions output
Add peerid to getpeerinfo to allow correlation with the logs.

This seems to have been missed in 3764.