Merge branch 'hotfix/1.1.5' v1.1.5
authorIan Weller <ian@gaslightmedia.com>
Thu, 19 May 2016 19:19:09 +0000 (15:19 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 19 May 2016 19:19:09 +0000 (15:19 -0400)

Trivial merge