bitcoin/bitcoin — pull request #5171 by jtimon (2014-10-29 20:21:13+00:00)
Title: Continue proof of work encapsulation

It is built on top of #5170, replaces #4506 and continues #4377.