Merge branch 'hotfix/1.2.17' v1.2.17
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 7 Jul 2016 19:47:36 +0000 (15:47 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 7 Jul 2016 19:47:36 +0000 (15:47 -0400)

Trivial merge