Merge tag 'v1.1.2' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 8 Aug 2016 16:57:21 +0000 (12:57 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 8 Aug 2016 16:57:21 +0000 (12:57 -0400)
v1.1.2


Trivial merge