Messed up AutoChooser.
Merge origin/master