Merge branch 'hotfix/1.1.14' master v1.1.14
authorIan Weller <ian@gaslightmedia.com>
Wed, 5 Apr 2017 19:18:40 +0000 (15:18 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 5 Apr 2017 19:18:40 +0000 (15:18 -0400)

Trivial merge