Merge origin/gael into gael

Conflicts:
	.gitignore