included bitcoin changes up to Tue Jun 17 09:20:31

 - latest bitcoin commit:
 e164828105a28609e9ca1f8b406fb8b18c14a9a7
doc: missing parts in this branch