Merge branch 'hotfix/1.0.21' v1.0.21
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 11 Mar 2016 16:21:28 +0000 (11:21 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 11 Mar 2016 16:21:28 +0000 (11:21 -0500)

Trivial merge