Merge branch 'release/1.0.13' v1.0.13
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 21 Jul 2017 20:29:12 +0000 (16:29 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 21 Jul 2017 20:29:12 +0000 (16:29 -0400)

Trivial merge