Merge branch 'release/1.5.21' v1.5.21
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 5 Jun 2018 18:14:45 +0000 (14:14 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 5 Jun 2018 18:14:45 +0000 (14:14 -0400)

Trivial merge