Merged https://github.com/bitcoin/bitcoin/pull/3652
Merge pull request #4 from viacoin/utxo_aware

Merged https://github.com/bitcoin/bitcoin/pull/3652