Fixed a bug where the run shortcut would throw you back from a branch into trunk/default
Merge branch 'katana' into specifySlave