Merge branch 'cmaurini/tao-in-petsc'
Merge branch 'garth/fixes-for-petsc-64'
Merge branch 'master' into garth/fix-issue-287

Conflicts:
	CMakeLists.txt
Add MPI_LONG_LONG type in MPI wrappers.
Merge branch 'garth/fixes-for-petsc-64'
Merge branch 'master' into next