Merge branch 'release/1.2.1' master v1.2.1
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 13 Jul 2018 13:45:23 +0000 (09:45 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 13 Jul 2018 13:45:23 +0000 (09:45 -0400)

Trivial merge