Merge branch 'hotfix/1.1.14' v1.1.14
authorIan Weller <ian@gaslightmedia.com>
Fri, 8 Jul 2016 18:05:12 +0000 (14:05 -0400)
committerIan Weller <ian@gaslightmedia.com>
Fri, 8 Jul 2016 18:05:12 +0000 (14:05 -0400)

Trivial merge