Merge tag 'v1.5.21' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 5 Jun 2018 18:14:51 +0000 (14:14 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 5 Jun 2018 18:14:51 +0000 (14:14 -0400)
Version 1.5.21


Trivial merge