Merge remote-tracking branch 'bb/next' into next

Clean up after ungraceful loss of racy merge.

* bb/next:
  DMCircuit: Forgot to modify extern declaration for DMCreateMatrix_Circuit
  DMCircuit: DMCreateMatrix() related fix for circuit example
  DMCircuit: Fixes for fortran stubs