01/17/2014 EOD Commit
Merge branch 'Austin's-Branch'