Merge branch 'hotfix/1.1.19' v1.1.19
authorIan Weller <ian@gaslightmedia.com>
Thu, 19 May 2016 15:02:59 +0000 (11:02 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 19 May 2016 15:02:59 +0000 (11:02 -0400)

Trivial merge