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)

Trivial merge