Merge branch 'master' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 12 May 2017 19:56:09 +0000 (15:56 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 12 May 2017 19:56:09 +0000 (15:56 -0400)

Trivial merge