Merge tag 'v1.1.2' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 3 Aug 2016 12:35:26 +0000 (08:35 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 3 Aug 2016 12:35:26 +0000 (08:35 -0400)
v1.1.2


Trivial merge