Merge branch 'martinal/topic-cleanup-ufl-algorithms'
Merge branch 'martinal/topic-add-function-argument-to-project'
Merge branch 'pefarrell/hpc-tweaks'
Merge branch 'garth/fix-issue-338'
Merge branch 'aslakbergersen/topic-prepare-py3-rebased'

Conflicts:
	site-packages/dolfin/fem/projection.py
Merge branch 'jan/fix-module-signature'
Disable -relativeimports even for -py3 to see how buildbot reacts.
Merge branch 'martinal/topic-swig-quickfix' into next