the magit-blame-mode test seems to cause issues in travis
Merge branch 'maint'

Conflicts:
	tests/magit-tests.el
Merge branch 'master' into next