Merge branch 'hotfix/1.0.21'
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 19 Feb 2016 17:12:27 +0000 (12:12 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 19 Feb 2016 17:12:27 +0000 (12:12 -0500)

Trivial merge