Merge tag 'v1.0.15' into develop
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 8 Jan 2016 22:25:33 +0000 (17:25 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 8 Jan 2016 22:25:33 +0000 (17:25 -0500)
merge tags


Trivial merge