merge upstream

[niklasad1]

No description provided.

[soc1c]

does not compile somehow

  Compiling ethcore v1.12.0 (/home/travis/build/goerli/parity-goerli/ethcore)
error[E0407]: method `executive_author` is not a member of trait `Engine`
   --> ethcore/src/engines/clique/mod.rs:748:2
    |
748 |       fn executive_author(&self, header: &Header) -> Address {
    |  _____^
749 | |         // Should have been verified now.
750 | |         recover_creator(header).expect("Unable to extract creator.")
751 | |     }
    | |_____^ not a member of trait `Engine`
error[E0599]: no method named `executive_author` found for type `&dyn engines::EthEngine` in the current scope
   --> ethcore/src/block.rs:517:10
    |
517 |         engine.executive_author(&header),
    |                ^^^^^^^^^^^^^^^^
error: aborting due to 2 previous errors
Some errors occurred: E0407, E0599.
For more information about an error, try `rustc --explain E0407`.
error: Could not compile `ethcore`.
To learn more, run the command again with --verbose.
The command "cargo build -p parity-ethereum" exited with 101.