Fixing typo
Merge branch 'master' into 5e_launch