Re-merged branch 'master' (Sphaero's changes that got unmerged)