Merge branch 'hotfix/2.0.17' v2.0.17
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 16 Jun 2017 19:13:03 +0000 (15:13 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 16 Jun 2017 19:13:03 +0000 (15:13 -0400)

Trivial merge