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

Trivial merge