Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	engine/src/main/java/org/terasology/rendering/nui/widgets/UIScrollbar.java