Merge remote-tracking branch 'origin/fredrik' into fredrik

Conflicts:
	.idea/workspace.xml