Merge branches 'master' and 'reese'
Merge branches 'reese' and 'master' into reese