Merge tag 'v1.6.54' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 25 Jul 2017 19:43:03 +0000 (15:43 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 25 Jul 2017 19:43:03 +0000 (15:43 -0400)
Version 1.6.54


Trivial merge