Merge tag 'vv1.0.14' into develop
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 8 Jan 2016 22:21:44 +0000 (17:21 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 8 Jan 2016 22:21:44 +0000 (17:21 -0500)
merge tag


Trivial merge