Conflict: configs/config-picocoin.h was both edited and removed. Resolution: removed, since this is the whole point of PR #1280 and the changes in development are no longer relevant.