Merge branch 'release/1.0.14' v1.0.14
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 2 Mar 2017 13:45:15 +0000 (08:45 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 2 Mar 2017 13:45:15 +0000 (08:45 -0500)

Trivial merge