Merge branch 'hotfix/1.0.20'
authorIan Weller <ian@gaslightmedia.com>
Fri, 19 Feb 2016 19:20:01 +0000 (14:20 -0500)
committerIan Weller <ian@gaslightmedia.com>
Fri, 19 Feb 2016 19:20:01 +0000 (14:20 -0500)

Trivial merge