Merge branch 'hotfix/1.5.14' v1.5.14
authorIan Weller <ian@gaslightmedia.com>
Thu, 4 May 2017 19:52:42 +0000 (15:52 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 4 May 2017 19:52:42 +0000 (15:52 -0400)

Trivial merge