Merge tag 'v1.6.48' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 5 Jul 2017 15:26:04 +0000 (11:26 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 5 Jul 2017 15:26:04 +0000 (11:26 -0400)
Version 1.6.48


Trivial merge