Manual merge of 0.1.2 changes; block 401 PoW generation, non-starting PoS