Merge tag 'v1.0.26' into develop
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 9 May 2016 19:04:01 +0000 (15:04 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 9 May 2016 19:04:01 +0000 (15:04 -0400)
v1.0.26


Trivial merge