Merge branch '1.6' into 'stable/ws2p-v1.1-trymerge'

# Conflicts:
#   app/modules/prover/lib/engine.ts

app/modules/prover/lib/engine.ts

@@ -30,7 +30,6 @@ export class PowEngine {
   }
 
   async prove(stuff:any) {
-    
         if (this.cluster.hasProofPending) {
           await this.cluster.cancelWork()
         }
@@ -43,10 +42,6 @@ export class PowEngine {
         return await this.cluster.proveByWorkers(stuff)
   }
 
-  cancel() {
-    return this.cluster.cancelWork()
-  }
-
   setConf(value:any) {
     if (os.arch().match(/arm/) && value.cpu !== undefined) {
       value.cpu /= 2; // Don't know exactly why is ARM so much saturated by PoW, so let's divide by 2