Merge branch 'garth/fix-issue-430-samg'

Conflicts:
	ChangeLog
Merge branch 'garth/switch-default-lu-solver-64-bit'
Merge branch 'master' into next

Conflicts:
	ChangeLog
Use Lawrence Mitchell's suggestion to get branch name in cmake.local script.
Merge branch 'johannr/fix-issue-233' into next