Work around https://github.com/nimbusproject/nimbus/issues/121
Merge branch 'master' into phantom0.2