ads latest setup_my_machine
Merge branch 'master' into jmontross