Merge tag 'v1.0.5' into develop
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 31 May 2016 19:33:51 +0000 (15:33 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 31 May 2016 19:33:51 +0000 (15:33 -0400)
overriding wordpress default FROM header


Trivial merge