Merge branch 'hotfix/1.0.20' v1.0.20
authorIan Weller <ian@gaslightmedia.com>
Fri, 31 Mar 2017 15:43:20 +0000 (11:43 -0400)
committerIan Weller <ian@gaslightmedia.com>
Fri, 31 Mar 2017 15:43:20 +0000 (11:43 -0400)

Trivial merge