Merge tag 'v1.2.1' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 13 Jul 2018 13:45:29 +0000 (09:45 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 13 Jul 2018 13:45:29 +0000 (09:45 -0400)
Version 1.2.1


Trivial merge