Merge branch 'release/1.0.5' v1.0.5
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 20 Jun 2016 14:38:55 +0000 (10:38 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 20 Jun 2016 14:38:55 +0000 (10:38 -0400)

Trivial merge