Merge branch 'release/1.6.47' v1.6.47
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 28 Jun 2017 14:17:28 +0000 (10:17 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 28 Jun 2017 14:17:28 +0000 (10:17 -0400)

Trivial merge