Merge branch 'hotfix/1.1.2' v1.1.2
authorLaury GvR <laury@gaslightmedia.com>
Mon, 8 Aug 2016 16:57:16 +0000 (12:57 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 8 Aug 2016 16:57:16 +0000 (12:57 -0400)

Trivial merge