Merge branch 'chris/intel-compatibility'
Merge branch 'johannr/cmake-config-python-lib'
Fix issue 206.
Pass PETSc a separate workspace so that linesearches work.
Safeguard the SNES solve: make it more robust.

If the residual at a point is NaN, then instead change that
to 1e100 in the objective evaluation, so that PETSc doesn't
crash straight away, but instead has an opportunity to
backtrack via linesearching.
Merge branch 'jan/local2global-python'
Merge branch 'jan/fix-issue-377'
Merge branch 'master' into pefarrell/snes-linesearch-fixes
Merge branch 'pefarrell/snes-linesearch-fixes' into next
Merge branch 'jan/fix-issue-206' into next