2.6
Frederik
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
2.7
Frederik