Merge branch 'release/1.5.17' v1.5.17
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 20 Feb 2018 21:02:24 +0000 (16:02 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 20 Feb 2018 21:02:24 +0000 (16:02 -0500)
commit1a51e470aaffd6270c95a44c0c82f58d687ed364
treefe6ca73321e378e1cca611f7501fd463e0c6fe10
parentc75920b661c6d4447845ab2b869ad9964d481ac6
parentf1f4464f2008124519428de380b8e067a887658c
Merge branch 'release/1.5.17'