Merge remote-tracking branch 'origin/master' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Fri, 16 Sep 2016 14:21:24 +0000 (10:21 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Fri, 16 Sep 2016 14:21:24 +0000 (10:21 -0400)

Trivial merge