Brian's formatting OCD strikes again
Merge remote-tracking branch 'origin/presentation' into presentation
Merge branch 'presentation' into dev