Merge tag 'v1.0.5' into develop
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 20 Jun 2016 14:39:06 +0000 (10:39 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 20 Jun 2016 14:39:06 +0000 (10:39 -0400)
small change to merge previous push onto master


Trivial merge