Merge branch 'release/1.6.49' v1.6.49
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 6 Jul 2017 19:12:07 +0000 (15:12 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 6 Jul 2017 19:12:07 +0000 (15:12 -0400)

Trivial merge