Merge branch 'release/1.0.14' v1.0.14
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 1 Sep 2017 12:59:24 +0000 (08:59 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 1 Sep 2017 12:59:24 +0000 (08:59 -0400)

Trivial merge