Merging in latest release of scenario editor