Merge branch 'release/1.2.24' v1.2.24
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 20 Apr 2017 19:36:01 +0000 (15:36 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 20 Apr 2017 19:36:01 +0000 (15:36 -0400)

Trivial merge