Merge branch 'prbrune/snes-fixvilinesearchnorms' into maint

Conflicts:
	src/snes/linesearch/impls/bt/linesearchbt.c
Merge branch 'barry/fix-hdf5-py'
Merge branch 'placasse/fix-matsetoption-collective' into maint

* placasse/fix-matsetoption-collective:
  MatSetOption not always logically collective.
Merge branch 'jed/fix-viewer-matlab-info' into maint

* jed/fix-viewer-matlab-info:
  Viewer: fix Binary Matlab viewer info to use '#' instead of '%'
parmetis: update tarball to parmetis-4.0.2-p5 which fixes an install issue with cygwin
Merge branch 'maint'
Merge branch 'master' into next
Merge branch 'karlrupp/fix-viennacl-petscobject-cast'
fix citation 'Golub_Varga_1961'
Merge branch 'master' of bitbucket.org:petsc/petsc
PetscFE: Added a real number type to the OpenCL implementation
PetscFE: Added marshalling to the OpenCL implementation
SNES ex62: Fixed comments
Merge branch 'knepley/feature-dt-fem' into next

* knepley/feature-dt-fem:
  SNES ex62: Fixed comments
  PetscFE: Added marshalling to the OpenCL implementation
  PetscFE: Added a real number type to the OpenCL implementation
Merge commit 'ORIG_HEAD'

Fix racy merge

* commit 'ORIG_HEAD':
  fix citation 'Golub_Varga_1961'
parms: update tarball with fix for namespace conflict with metis
Merge branch 'maint'
Merge branch 'master' into next
Merge branch 'jed/snes-linesearch-warning'

* jed/snes-linesearch-warning:
  SNESLineSearch CP: simplify control flow for initial dot product
Merge branch 'next' of bitbucket.org:petsc/petsc into next

# By Jed Brown (2) and others
# Via Jed Brown (17) and others
* 'next' of bitbucket.org:petsc/petsc:
  parms: update tarball with fix for namespace conflict with metis
  fix citation 'Golub_Varga_1961'
  parmetis: update tarball to parmetis-4.0.2-p5 which fixes an install issue with cygwin
  Sys Logging: revert parent traversal
  fixed hdf5.py so that if self.libraries.compression is None the code still runs correctly
  DMDA: fix bad cast of DM_DA to PetscObject