Merge tag 'v1.0.16' into develop
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 8 Jan 2016 22:30:48 +0000 (17:30 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 8 Jan 2016 22:30:48 +0000 (17:30 -0500)
fixing syntax error


Trivial merge