Commit 5734768b9edaecedaa7b13fed2ce59cb588df7e8

Brian Lopez 2018-01-10T19:19:34

Merge remote-tracking branch 'origin/master' into charliesome/trailer-info