Merge branch 'hotfix/1.0.5' v1.0.5
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 27 May 2016 14:33:37 +0000 (10:33 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 27 May 2016 14:33:37 +0000 (10:33 -0400)

Trivial merge