Launcher v4.1

Just a little merge update to keep in sync with changes from wizden.