Merge branch 'hotfix/1.0.20' v1.0.20
authorIan Weller <ian@gaslightmedia.com>
Wed, 9 Mar 2016 15:47:15 +0000 (10:47 -0500)
committerIan Weller <ian@gaslightmedia.com>
Wed, 9 Mar 2016 15:47:15 +0000 (10:47 -0500)

Trivial merge