Merge branch 'hotfix/1.6.14' v1.6.14
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 2 Mar 2017 19:59:11 +0000 (14:59 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 2 Mar 2017 19:59:11 +0000 (14:59 -0500)

Trivial merge