Fix crash.
Merge branch 'balloon' into dataSourceBrowser

Conflicts:
	Source/Widgets/Balloon/BalloonViewModel.js