Merge tag 'v1.2.18' into develop
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 14 Dec 2015 19:12:09 +0000 (14:12 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 14 Dec 2015 19:12:09 +0000 (14:12 -0500)
merging branch after link fix


Trivial merge