Merge branch 'master' into next
Merge branch 'garth/timer-in-cpp' into next
Merge branch 'garth/fix-cmake-flags' into next
Merge branch 'fix-issue-111' into next
Merge branch 'fix-issue-32' into next

Conflicts:
	ChangeLog
Merge branch 'fix-issue-111' into next
Merge branch 'garth/remove-quadrature' into next

Conflicts:
	ChangeLog
Merge branch 'dolfin-demo-documentation' into next

Conflicts:
	demo/documented/mesh-generation/python/demo_mesh_generation.py
	demo/undocumented/mesh-generation/cpp/main.cpp
	demo/undocumented/mesh-generation/python/demo_mesh-generation.py
	demo/undocumented/mesh-generation/python/demo_mesh_generation.py
Merge branch 'dolfin-demo-documentation' into next
Merge branch 'dolfin-demo-documentation' into next
Merge branch 'dolfin-demo-documentation' into next
Merge branch 'dolfin-demo-documentation' into next
Merge branch 'dolfin-demo-documentation' into next

Conflicts:
	cmake/scripts/download-demo-data
Merge branch 'dolfin-demo-documentation' into next
Merge branch 'fix-runtime-swig-version' into next
Merge branch 'dolfin-demo-documentation' into next

Conflicts:
	test/regression/test.py
Merge branch 'master' into next

Conflicts:
	build.dolfin-demo-documentation/demo/documented/mesh-generation/python/demo_mesh_generation.py
	demo/documented/mesh-generation/python/demo_mesh_generation.py
	demo/undocumented/mesh-generation/python/demo_mesh_generation.py
Merge branch 'garth/dofmap-comments' into next
Speed up graph ordering via SCOTCH.
Allow SCOTCH strategy string to be passed to ordering function and add interface for Gibbs-Poole-Stockmeyer reordering.

Use SCOTCH by default for dof re-ordering, if available. Faster and better scaling than Boost RCM.