Merge branch 'johanhake/fix-issue-417'
Merged in chris/in-triangle (pull request #186)

Improve collision detection (issue #296)
Merged fenics-project/dolfin into master
UF_long is deprecated, use SuiteSparse_long instead
Merge branch 'MarcoMorandini/remove-UF_long' into next