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

Trivial merge