Merge branch 'release/1.6.24' v1.6.24
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 14 Mar 2017 15:59:45 +0000 (11:59 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 14 Mar 2017 15:59:45 +0000 (11:59 -0400)

Trivial merge