Re-basing from main bitcoinj repo