Merge branch 'hotfix/1.2.14' v1.2.14
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 27 Jul 2017 19:18:23 +0000 (15:18 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 27 Jul 2017 19:18:23 +0000 (15:18 -0400)

Trivial merge