Merge tag 'v1.1.93' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 15 Jun 2015 19:29:46 +0000 (15:29 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 15 Jun 2015 19:29:46 +0000 (15:29 -0400)
v1.1.93


Trivial merge